Removing the diff marker

dagrejs · Mar 6, 2024 · 9f91089 · 9f91089
1 parent 2f47c92
commit 9f91089
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/lib/layout.js b/lib/layout.js
@@ -17,7 +17,6 @@ let Graph = require("@dagrejs/graphlib").Graph;
 module.exports = layout;
 
 function layout(g, opts) {
-<<<<<<< HEAD
   let time = opts && opts.debugTiming ? util.time : util.notime;
   time("layout", () => {
     let layoutGraph =