fixed merge conflict in IDE specific files.

AguaClara · Sep 11, 2017 · 7aee8e7 · 7aee8e7
2 parents a011d0c + 1bac643
commit 7aee8e7
Show file tree

Hide file tree

Showing 22 changed files with 268 additions and 1,941 deletions.
diff --git a/.idea/aide_design.iml b/.idea/aide_design.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/preferred-vcs.xml b/.idea/preferred-vcs.xml
diff --git a/Research/HumicAcidData_Yingda.py b/Research/HumicAcidData_Yingda.py