missed a conflict

pattern-lab · Jul 20, 2014 · b4998ec · b4998ec
1 parent 2502700
commit b4998ec
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -266,11 +266,7 @@ var patternlab_engine = function(grunt){
 
 		//ishControls
 		var ishControlsTemplate = grunt.file.read('./source/_patternlab-files/partials/ishControls.mustache');
-<<<<<<< HEAD
-		var ishControlsPartialHtml = mustache.render(ishControlsTemplate, patternlab.config);
-=======
 		var ishControlsPartialHtml = renderPattern(ishControlsTemplate, patternlab.config);
->>>>>>> a38e78c13ca1f9b51ca570c2c1ebb077f880214c
 
 		//patternPaths
 		var patternPathsTemplate = grunt.file.read('./source/_patternlab-files/partials/patternPaths.mustache');