messy banner file

bmuenzenmeyer · bmuenzenmeyer · commit 0f51b455803b · 2014-05-08T00:13:22.000-05:00
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -1,9 +1,5 @@
 /* 
-<<<<<<< HEAD
  * patternlab-node - v0.1.1 - 2014-05-07 
-=======
- * patternlab-node - v0.1.1 - 2014-05-05 
->>>>>>> master
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
