Auto stash before merge of "master" and "Tainfante_origin/master"

tainfante · Nov 11, 2017 · 5305e0b · 5305e0b
1 parent 47d583a
commit 5305e0b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 898 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+
+\.idea/misc\.xml
+
+\.idea/workspace\.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml