Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/electricFeel/savory
Browse files Browse the repository at this point in the history
Conflicts:
	.gitignore
  • Loading branch information
electricFeel committed Aug 21, 2014
2 parents b721cf8 + bf0dae9 commit 3c53527
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion .gitignore
@@ -1,5 +1,10 @@
/priv
/_build
/deps
erl_crash.dump
.eunit
deps
*.o
*.beam
*.plt
*.ez
erl_crash.dump

0 comments on commit 3c53527

Please sign in to comment.