From e77cbf4fa3dc4bdd25b4babfbd239d5adf965cdf Mon Sep 17 00:00:00 2001
From: Andrew Nicolaou <me@andrewnicolaou.co.uk>
Date: Wed, 15 May 2019 16:39:53 +0200
Subject: [PATCH] Changes API_KEY_REMOVED action constant to match
 API_KEY_CREATED

---
 client/modules/User/reducers.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/client/modules/User/reducers.js b/client/modules/User/reducers.js
index b298724d..00454acd 100644
--- a/client/modules/User/reducers.js
+++ b/client/modules/User/reducers.js
@@ -31,15 +31,9 @@ const user = (state = { authenticated: false }, action) => {
       return Object.assign({}, state, { emailVerificationTokenState: 'invalid' });
     case ActionTypes.SETTINGS_UPDATED:
       return { ...state, ...action.user };
-<<<<<<< HEAD
     case ActionTypes.API_KEY_REMOVED:
       return { ...state, ...action.user };
     case ActionTypes.API_KEY_CREATED:
-=======
-    case ActionTypes.REMOVED_API_KEY:
-      return { ...state, ...action.user };
-    case ActionTypes.ADDED_API_KEY:
->>>>>>> You can now generate keys from the advanced settings interface
       return { ...state, ...action.user };
     default:
       return state;