Ensure idea files are not in repo (#65)

CSVD · Aug 27, 2019 · c6a16fc · c6a16fc
1 parent 18f3bd2
commit c6a16fc
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 70 deletions.
diff --git a/.gitignore b/.gitignore
@@ -378,11 +378,5 @@ fabric.properties
 !/package/scripts/splunkmetrics.sh
 !/package/scripts/
 .ecs
-=======
 /test-results/
-/.idea/workspace.xml
-/.idea/tasks.xml
-!/package/scripts/switch_transport.sh
-!/package/scripts/splunkmetrics.sh
-!/package/scripts/
->>>>>>> master
+/.idea/
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/sc4s.iml b/.idea/sc4s.iml
diff --git a/.idea/splunk-connect-for-syslog.iml b/.idea/splunk-connect-for-syslog.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml