fix conflict

clmath · clmath · commit 3c6dc3c253b5 · 2014-02-12T16:45:33.000+01:00
diff --git a/i18n.js b/i18n.js
@@ -120,6 +120,7 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 			}
 		};
 
+	/* jshint -W074 */
 	return {
 		/* jshint -W074 */
 		load: function (name, req, onLoad, config) {
@@ -209,5 +210,8 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod
 			}
 			build.reset();
 		}
+
+
 	};
+	/* jshint +W074 */
 });

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod`
`120`	`120`	`}`
`121`	`121`	`};`
`122`	`122`
	`123`	`+ /* jshint -W074 */`
`123`	`124`	`return {`
`124`	`125`	`/* jshint -W074 */`
`125`	`126`	`load: function (name, req, onLoad, config) {`
`@@ -209,5 +210,8 @@ define(["./i18n/common", "./i18n/build", "module"], function (common, build, mod`
`209`	`210`	`}`
`210`	`211`	`build.reset();`
`211`	`212`	`}`
	`213`	`+`
	`214`	`+`
`212`	`215`	`};`
	`216`	`+ /* jshint +W074 */`
`213`	`217`	`});`