From 9f91089dddf8e787a3a36035f8b1bed1123c908c Mon Sep 17 00:00:00 2001
From: David Newell <davidnewell@google.com>
Date: Wed, 6 Mar 2024 09:21:48 +0000
Subject: [PATCH] Removing the diff marker

---
 lib/layout.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/layout.js b/lib/layout.js
index 75470c16..dfccf301 100644
--- 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 =