fix merge

hmsklee · hmsklee · commit dd045e13353b · 2017-05-09T13:25:51.000-05:00
diff --git a/index.html b/index.html
@@ -529,7 +529,7 @@
 
     changeSizeOfSVGPanel(window.innerWidth - 16, (rows[rows.length - 1].lineBottom.y() ) + 1);
 
-  }
+  // }
 
 
   /* init graph layout object */
@@ -593,7 +593,7 @@
   }
 
   window.onresize = _.debounce(resize, 300);
-}
+// }
 
 </script>
 
diff --git a/js/annotate.js b/js/annotate.js
@@ -515,7 +515,7 @@ function calcAttachPoints(link, strategy)  {
       //  link.rightAttach  = sides.LEFT; 
 
     }
-  } else if (strategy == strategies.FARTHEST) {
+  // } else if (strategy == strategies.FARTHEST) {
     //console.log("" + link.id + " strategy = FARTHEST");
 
   /*

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ function calcAttachPoints(link, strategy) {`
`515`	`515`	`// link.rightAttach = sides.LEFT;`
`516`	`516`
`517`	`517`	`}`
`518`		`- } else if (strategy == strategies.FARTHEST) {`
	`518`	`+ // } else if (strategy == strategies.FARTHEST) {`
`519`	`519`	`//console.log("" + link.id + " strategy = FARTHEST");`
`520`	`520`
`521`	`521`	`/*`