diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
| commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
| tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /test/backupstore/Makefile.extra | |
| parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
| parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) | |
merge upstream version 0.12
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 |