uk: Resolve poconflicts
authorPeter Eisentraut <peter@eisentraut.org>
Thu, 17 Aug 2023 15:16:43 +0000 (17:16 +0200)
committerPeter Eisentraut <peter@eisentraut.org>
Thu, 17 Aug 2023 15:16:43 +0000 (17:16 +0200)
commitdf618c7c13635dbdc0507f78c3962fe80a2168f5
tree873d0ba653ceac0697fdbf34aef50ea7e76df0e4
parent2d1781a6ce1df2a02c6b31d59d4959d7fc138e52
uk: Resolve poconflicts
uk/pg_upgrade.po
uk/postgres.po