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