Fix regression test output broken by 05b5df5

ossc-db · Mar 6, 2017 · d087c8c · d087c8c
1 parent 05b5df5
commit d087c8c
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/expected/init.out b/expected/init.out
@@ -4,12 +4,8 @@
 0
 results/init/backup/
 results/init/backup/backup/
-<<<<<<< HEAD
-results/init/backup/backup/pg_xlog/
-=======
 results/init/backup/backup_catalog_version
-results/init/backup/backup/pg_wal/
->>>>>>> a080be5... Add catalog_version to track history of catalog format changes
+results/init/backup/backup/pg_xlog/
 results/init/backup/backup/srvlog/
 results/init/backup/data_checksum_version
 results/init/backup/pg_rman.ini
@@ -20,12 +16,8 @@ results/init/backup/timeline_history/
 0
 results/init/backup/
 results/init/backup/backup/
-<<<<<<< HEAD
-results/init/backup/backup/pg_xlog/
-=======
 results/init/backup/backup_catalog_version
-results/init/backup/backup/pg_wal/
->>>>>>> a080be5... Add catalog_version to track history of catalog format changes
+results/init/backup/backup/pg_xlog/
 results/init/backup/backup/srvlog/
 results/init/backup/data_checksum_version
 results/init/backup/pg_rman.ini
@@ -39,12 +31,8 @@ HINT: Please set ARCLOG_PATH in pg_rman.ini or environmental variable.
 0
 results/init/backup/
 results/init/backup/backup/
-<<<<<<< HEAD
-results/init/backup/backup/pg_xlog/
-=======
 results/init/backup/backup_catalog_version
-results/init/backup/backup/pg_wal/
->>>>>>> a080be5... Add catalog_version to track history of catalog format changes
+results/init/backup/backup/pg_xlog/
 results/init/backup/backup/srvlog/
 results/init/backup/data_checksum_version
 results/init/backup/pg_rman.ini