From 7f4b9839fe136acb0410d649d0a9ea53a40b5354 Mon Sep 17 00:00:00 2001
From: Khalid Shakir <kshakir@broadinstitute.org>
Date: Mon, 23 Jan 2017 13:05:08 -0500
Subject: [PATCH] Disabled type annotation inspections in IntelliJ. Synced
 common scala .gitignore across repositories.

---
 .gitignore                                   | 15 +++++++++++----
 .idea/inspectionProfiles/Project_Default.xml |  6 ++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml

diff --git a/.gitignore b/.gitignore
index fa01827..387acc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,12 @@
-tags
-.idea/
-target
-.artifactory
+# common scala config
 *~
+.DS_Store
+.artifactory
+.idea/*
+!/.idea/inspectionProfiles/
+.idea/inspectionProfiles/*
+!/.idea/inspectionProfiles/Project_Default.xml
+target
+
+# custom config
+tags
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..b15d7f2
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="TypeAnnotation" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file