From 8f9cef5a684f1318135fe01c2eb6653188ad91b9 Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Tue, 15 Sep 2020 11:31:40 +0200
Subject: [PATCH] Fixed merge error

---
 ghost/portal/src/components/pages/AccountHomePage.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ghost/portal/src/components/pages/AccountHomePage.js b/ghost/portal/src/components/pages/AccountHomePage.js
index 186aa9fb07..7fa3b8eff3 100644
--- a/ghost/portal/src/components/pages/AccountHomePage.js
+++ b/ghost/portal/src/components/pages/AccountHomePage.js
@@ -8,13 +8,10 @@ import {getDateString} from '../../utils/date-time';
 const React = require('react');
 
 export const AccountHomePageStyles = `
-<<<<<<< HEAD
     .gh-portal-content.account-home {
         max-height: calc(100vh - 12vw - 104px);
     }
 
-=======
->>>>>>> Added back button and rearranged logout
     .gh-portal-account-main {
         background: var(--grey13);
         margin: -32px;