Merge branch 'master' of https://github.com/sehlstrom/ElFi

Conflicts: .gitignore
sehlstrom · Jan 10, 2015 · 5076c28 · 5076c28
2 parents 46beee3 + 70195b5
commit 5076c28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1 +1,5 @@
-.DS_Store
+<<<<<<< HEAD
+.DS_Store
+=======
+.DS_Store
+>>>>>>> 70195b50bb7c6fa877b629d92dc3a6ca7ffff15b