diff options
Diffstat (limited to 'test/backupstore/Makefile.extra')
| -rw-r--r-- | test/backupstore/Makefile.extra | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/backupstore/Makefile.extra b/test/backupstore/Makefile.extra index 2ce40389..b319736c 100644 --- a/test/backupstore/Makefile.extra +++ b/test/backupstore/Makefile.extra @@ -1,5 +1 @@ -<<<<<<< HEAD -link-extra: ../../bin/bbstored/HousekeepStoreAccount.o -======= link-extra: ../../lib/backupstore/HousekeepStoreAccount.o ->>>>>>> 0.12 |