diff options
Diffstat (limited to 'test/bbackupd/Makefile.extra')
| -rw-r--r-- | test/bbackupd/Makefile.extra | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/test/bbackupd/Makefile.extra b/test/bbackupd/Makefile.extra index 1bd897bd..705345a9 100644 --- a/test/bbackupd/Makefile.extra +++ b/test/bbackupd/Makefile.extra @@ -6,14 +6,6 @@ link-extra: ../../bin/bbackupd/autogen_ClientException.o \ ../../bin/bbackupd/BackupClientInodeToIDMap.o \ ../../bin/bbackupd/Win32ServiceFunctions.o \ ../../bin/bbackupd/BackupDaemon.o \ -<<<<<<< HEAD - ../../bin/bbstored/BackupStoreContext.o \ - ../../bin/bbstored/BBStoreDHousekeeping.o \ - ../../bin/bbstored/HousekeepStoreAccount.o \ - ../../bin/bbstored/autogen_BackupProtocolServer.o \ - ../../bin/bbstored/BackupCommands.o \ - ../../bin/bbstored/BackupStoreDaemon.o -======= ../../bin/bbstored/BBStoreDHousekeeping.o \ ../../lib/backupstore/HousekeepStoreAccount.o \ ../../lib/backupstore/autogen_BackupProtocol.o \ @@ -22,4 +14,3 @@ link-extra: ../../bin/bbackupd/autogen_ClientException.o \ ../../bin/bbstored/BackupStoreDaemon.o \ ../../bin/bbackupquery/BackupQueries.o \ ../../bin/bbackupquery/autogen_Documentation.o ->>>>>>> 0.12 |