Fix Merge issues

tamchow · Oct 16, 2018 · ca8f1be · ca8f1be
2 parents 1ccf2ba + cb8abf4
commit ca8f1be
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@
 # User-specific stuff:
 .idea/**/workspace.xml
 .idea/**/tasks.xml
-.idea/dictionaries
 
 # Sensitive or high-churn files:
 .idea/**/dataSources/
@@ -80,5 +79,4 @@ project/plugins/project/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-project/project/
-src/test/
+project/project/
diff --git a/.idea/dictionaries/Tamoghna_Chowdhury.xml b/.idea/dictionaries/Tamoghna_Chowdhury.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/ChemotaxisSimulator.iml → .../modules/Projects-ChemotaxisSimulator.iml b/.idea/modules/ChemotaxisSimulator.iml → .../modules/Projects-ChemotaxisSimulator.iml
diff --git a/.idea/scala_compiler.xml b/.idea/scala_compiler.xml