From 318475fc03426ea94a38a3d35fb1889ceb6988fb Mon Sep 17 00:00:00 2001
From: Cassie Tarakajian <ctarakajian@gmail.com>
Date: Tue, 20 Sep 2016 18:34:20 -0400
Subject: [PATCH] fix merge conflicts, actually

---
 client/modules/IDE/reducers/ide.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/modules/IDE/reducers/ide.js b/client/modules/IDE/reducers/ide.js
index f8c16aa8..840e3068 100644
--- a/client/modules/IDE/reducers/ide.js
+++ b/client/modules/IDE/reducers/ide.js
@@ -72,15 +72,12 @@ const ide = (state = initialState, action) => {
       return Object.assign({}, state, { keyboardShortcutVisible: true });
     case ActionTypes.CLOSE_KEYBOARD_SHORTCUT_MODAL:
       return Object.assign({}, state, { keyboardShortcutVisible: false });
-<<<<<<< HEAD
     case ActionTypes.SET_UNSAVED_CHANGES:
       return Object.assign({}, state, { unsavedChanges: action.value });
-=======
     case ActionTypes.DETECT_INFINITE_LOOPS:
       return Object.assign({}, state, { infiniteLoop: true });
     case ActionTypes.RESET_INFINITE_LOOPS:
       return Object.assign({}, state, { infiniteLoop: false });
->>>>>>> 43052cb675fa0bc500467f5c7c6643f3636493ae
     default:
       return state;
   }