From b0835d76991055c4368e0b4ca88a51e7dfda2cf8 Mon Sep 17 00:00:00 2001
From: alisan617 <atang@edx.org>
Date: Mon, 27 Jun 2016 11:32:33 -0400
Subject: [PATCH] PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update diff.xml

---
 diff.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/diff.xml b/diff.xml
index 89f9ea658f..edf382b9ac 100644
--- a/diff.xml
+++ b/diff.xml
@@ -9,4 +9,24 @@
       </entry>
     </option>
   </component>
+  <component name="TextDiffSettings">
+    <option name="PLACES_MAP">
+      <entry key="ChangesView">
+        <PlaceSettings>
+          <option name="EXPAND_BY_DEFAULT" value="false" />
+        </PlaceSettings>
+      </entry>
+      <entry key="CommitDialog">
+        <PlaceSettings>
+          <option name="EXPAND_BY_DEFAULT" value="false" />
+        </PlaceSettings>
+      </entry>
+      <entry key="Default">
+        <PlaceSettings />
+      </entry>
+      <entry key="Merge">
+        <PlaceSettings />
+      </entry>
+    </option>
+  </component>
 </application>
\ No newline at end of file