fixing conflict

dmi3y · dmi3y · commit 0a231821844b · 2014-04-29T23:57:07.000-07:00
diff --git a/tests/cli/cli-common.js b/tests/cli/cli-common.js
@@ -1,5 +1,4 @@
 /*jshint loopfunc:true, node:true */
-// mainly for testing --config cli option
 "use strict";
 function include(path, sandbox) {
     var

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`/jshint loopfunc:true, node:true /`
`2`		`-// mainly for testing --config cli option`
`3`	`2`	`"use strict";`
`4`	`3`	`function include(path, sandbox) {`
`5`	`4`	`var`