Fix some api doc

deadratfink · Jul 22, 2016 · fe0631d · fe0631d
1 parent ea826d7
commit fe0631d
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/writer.js b/lib/writer.js
@@ -443,16 +443,13 @@ function Writer(logger) {
      *     });
      *
      *
-<<<<<<< HEAD
      * // ---- write obj to object
      *
      * options = {
      *     dest: {},
      *     indent: 2
      * }
      *
-=======
->>>>>>> development
      * writer.writeJs(obj, options)
      *     .then(function (msg){
      *         logger.info(msg);