Update gitignore.

froala · Oct 28, 2016 · 40437a4 · 40437a4
1 parent d5546a5
commit 40437a4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,6 @@
 node_modules
 jspm_packages
-<<<<<<< HEAD
-=======
 bower_components
 .idea
 .DS_STORE
 build/reports
->>>>>>> webpack_compatible