resolve conflict

inasafe · Nov 9, 2012 · c584648 · c584648
1 parent 32a10c9
commit c584648
Show file tree

Hide file tree

Showing 345 changed files with 13,510 additions and 9,913 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,7 @@ setup.cfg
 run_qgis.sh
 .achievements
 .idea/runConfigurations/NoseTests_Realtime.xml
+.idea/workspace.xml
+pydev
+.idea/inasafe-dev.iml
+.idea/misc.xml
diff --git a/.idea/dictionaries/timlinux.xml b/.idea/dictionaries/timlinux.xml
diff --git a/.idea/inasafe-dev.iml b/.idea/inasafe-dev.iml
diff --git a/.idea/libraries/sass_stdlib.xml b/.idea/libraries/sass_stdlib.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/InaSAFE_Docs.xml b/.idea/runConfigurations/InaSAFE_Docs.xml
diff --git a/.idea/runConfigurations/NoseTest_VectorTest.xml b/.idea/runConfigurations/NoseTest_VectorTest.xml
diff --git a/.idea/runConfigurations/NoseTests_SAFE_QGIS.xml b/.idea/runConfigurations/NoseTests_SAFE_QGIS.xml
diff --git a/.idea/runConfigurations/Sphinx_HTML.xml b/.idea/runConfigurations/Sphinx_HTML.xml
diff --git a/.idea/testrunner.xml b/.idea/testrunner.xml