chore: minor refactor

ipfs · Aug 9, 2018 · 7a75adc · 7a75adc
1 parent f67adf8
commit 7a75adc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/default-datastore.js b/src/default-datastore.js
@@ -2,12 +2,6 @@
 
 // Default configuration for the datastore spec in node.js
 module.exports = {
-<<<<<<< HEAD
-=======
-  StorageGCWatermark: 90,
-  GCPeriod: '1h',
-  BloomFilterSize: 0,
->>>>>>> fix: interoperability with go repo - added tests
   Spec: {
     type: 'mount',
     mounts: [