fixing merge conflicts

bmuenzenmeyer · bmuenzenmeyer · commit 0ce790dcdae2 · 2014-12-13T01:29:52.000-06:00
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -83,7 +83,7 @@ var patternlab_engine = function(){
 			}
 
 			//make a new Pattern Object
-			var flatPatternName = subdir.replace(/[\/\\]/g, '-') + '-' + patternName;
+			var flatPatternName = subdir.replace(/\\/g, '-') + '-' + patternName;
 			
 			flatPatternName = flatPatternName.replace(/\\/g, '-');
 			currentPattern = new of.oPattern(flatPatternName, subdir, filename, {});

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ var patternlab_engine = function(){`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`//make a new Pattern Object`
`86`		`- var flatPatternName = subdir.replace(/[\/\\]/g, '-') + '-' + patternName;`
	`86`	`+ var flatPatternName = subdir.replace(/\\/g, '-') + '-' + patternName;`
`87`	`87`
`88`	`88`	`flatPatternName = flatPatternName.replace(/\\/g, '-');`
`89`	`89`	`currentPattern = new of.oPattern(flatPatternName, subdir, filename, {});`