From e07094bf74f9016a4d1340c54a82e664ff86e7f7 Mon Sep 17 00:00:00 2001
From: alisan617 <atang@edx.org>
Date: Mon, 11 Jul 2016 10:56:44 -0400
Subject: [PATCH] PY-2016.1.4 <alisantang@C02RP0YSG8WM.tld Update git.xml
 Create conda_packages.xml

---
 _mac/git.xml       | 1 +
 conda_packages.xml | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 conda_packages.xml

diff --git a/_mac/git.xml b/_mac/git.xml
index db2a4c49c8..9bc21a722f 100644
--- a/_mac/git.xml
+++ b/_mac/git.xml
@@ -1,5 +1,6 @@
 <application>
   <component name="Git.Application.Settings">
     <option name="myPathToGit" value="/usr/bin/git" />
+    <option name="SSH_EXECUTABLE" value="IDEA_SSH" />
   </component>
 </application>
\ No newline at end of file
diff --git a/conda_packages.xml b/conda_packages.xml
new file mode 100644
index 0000000000..fa907a7865
--- /dev/null
+++ b/conda_packages.xml
@@ -0,0 +1,7 @@
+<application>
+  <component name="PyCondaPackageService">
+    <option name="CONDA_CHANNELS">
+      <set />
+    </option>
+  </component>
+</application>
\ No newline at end of file