Skip to content

Commit 40aeb8b

Browse files
alubennikovaalubennikova
committed
fix merge conflict
1 parent 1d50157 commit 40aeb8b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎tests/expected/option_version.out

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
21
pg_probackup 2.5.0
3-
=======
4-
pg_probackup 2.4.8
5-
>>>>>>> master

0 commit comments

Comments
 (0)