Skip to content

Commit

Permalink
fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@jduttondesign
jduttondesign authored Dec 3, 2016
1 parent 81a9245 commit 0ae438f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*.DS_Store
.DS_Store
lib/node_modules/
lib/bower_components/
*javascripts/AppConstants.js
javascripts/AppConstants.js
npm-debug.log

0 comments on commit 0ae438f

Please sign in to comment.