From b3f56d9c3a54b7ebddf4ec1bb454f815f0333450 Mon Sep 17 00:00:00 2001
From: Greg Fodor <gfodor@gmail.com>
Date: Tue, 30 Oct 2018 02:31:40 +0000
Subject: [PATCH] Remove merge
---
src/react-components/ui-root.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
index e35b30972..b4a6fb25c 100644
--- a/src/react-components/ui-root.js
+++ b/src/react-components/ui-root.js
@@ -687,13 +687,10 @@ class UIRoot extends Component {
};
renderEntryStartPanel = () => {
-<<<<<<< HEAD
const textRows = this.state.pendingMessage.split("\n").length;
const pendingMessageTextareaHeight = textRows * 28 + "px";
const pendingMessageFieldHeight = textRows * 28 + 20 + "px";
-=======
const hasPush = navigator.serviceWorker && "PushManager" in window;
->>>>>>> 58f4eba535de1894589cb9dfa455da3e3376fb8d
return (
<div className={entryStyles.entryPanel}>
--
GitLab