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

MissionVistaCS · Apr 8, 2018 · cc12946 · cc12946
1 parent b4e51f7
commit cc12946
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Image-Board.iml b/Image-Board.iml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>