Permalink
Browse files

fixed .gitignore merge conflict

  • Loading branch information...
nickforddesign committed May 3, 2016
2 parents 4a277c5 + 555b86b commit 35dbd869992e5fcc114c182f208daaf38bb3bb57
Showing with 2 additions and 1 deletion.
  1. +2 −1 .gitignore
View
@@ -1,2 +1,3 @@
.DS_Store
-/node_modules
+/node_modules
+/bower_components

0 comments on commit 35dbd86

Please sign in to comment.