db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2026-06-21 01:34:15 +02:00
Code Issues Releases Activity

fix merge conflict

Browse Source
This commit is contained in:
anastasia
2021-01-22 22:43:35 +03:00
parent 1d50157053
commit 40aeb8be17
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/expected/option_version.out
-4
View File
@@ -1,5 +1 @@
<<<<<<< HEAD
pg_probackup 2.5.0
=======
pg_probackup 2.4.8
>>>>>>> master