Fix conflicts

bsiddiqui · Jul 19, 2018 · 979b738 · 979b738
2 parents 16e7d5d + 15e9191
commit 979b738
Show file tree

Hide file tree

Showing 3 changed files with 2,941 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -89,8 +89,12 @@ module.exports = (bookshelf, settings) => {
         );
       }
 
+<<<<<<< HEAD
       this.on("fetching", skipDeleted.bind(this));
       this.on("fetching:collection", skipDeleted.bind(this));
+=======
+      this.on('fetching', skipDeleted.bind(this))
+>>>>>>> upstream/master
     },
 
     /**