From ecaf37cc829760105e72db617b6b3d6048a78f23 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Fri, 3 Jan 2020 17:32:33 +1100
Subject: [PATCH] resolve merge issues

---
 js/views/inbox_view.js                           | 3 +--
 stylesheets/_session_theme_dark_left_pane.scss   | 7 ++-----
 ts/components/session/ActionsPanel.tsx           | 1 -
 ts/components/session/LeftPaneContactSection.tsx | 3 +--
 ts/global.d.ts                                   | 1 -
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/js/views/inbox_view.js b/js/views/inbox_view.js
index a1f4bb1dc..879fc4ef2 100644
--- a/js/views/inbox_view.js
+++ b/js/views/inbox_view.js
@@ -66,8 +66,7 @@
   Whisper.AppLoadingScreen = Whisper.View.extend({
     templateName: 'app-loading-screen',
     className: 'app-loading-screen',
-    updateProgress() {
-    },
+    updateProgress() {},
     render_attributes: {
       message: i18n('loading'),
     },
diff --git a/stylesheets/_session_theme_dark_left_pane.scss b/stylesheets/_session_theme_dark_left_pane.scss
index a15c0d782..0b2bd0a29 100644
--- a/stylesheets/_session_theme_dark_left_pane.scss
+++ b/stylesheets/_session_theme_dark_left_pane.scss
@@ -235,8 +235,7 @@ $session-compose-margin: 20px;
   }
 }
 
-.session-logo{
-
+.session-logo {
   &-128 {
     @include session-filter-color-green();
     width: 128px;
@@ -246,14 +245,12 @@ $session-compose-margin: 20px;
   &-text {
     font-size: 70px;
     font-weight: bold;
-    margin:0px;
+    margin: 0px;
     color: $session-color-white;
     font-family: $session-font-family;
   }
 }
 
-
-
 .app-loading-screen {
   @include session-dark-background;
 }
diff --git a/ts/components/session/ActionsPanel.tsx b/ts/components/session/ActionsPanel.tsx
index 83f191dd0..7184ab4e6 100644
--- a/ts/components/session/ActionsPanel.tsx
+++ b/ts/components/session/ActionsPanel.tsx
@@ -219,7 +219,6 @@ export class ActionsPanel extends React.Component<Props, State> {
         }
         unreadCount += conversation.unreadCount;
         if (unreadCount > 9) {
-
           return true;
         }
 
diff --git a/ts/components/session/LeftPaneContactSection.tsx b/ts/components/session/LeftPaneContactSection.tsx
index e259fb55f..978427070 100644
--- a/ts/components/session/LeftPaneContactSection.tsx
+++ b/ts/components/session/LeftPaneContactSection.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import {
   ConversationListItem,
-  PropsData as ConversationListItemPropsType
+  PropsData as ConversationListItemPropsType,
 } from '../ConversationListItem';
 import { PropsData as SearchResultsProps } from '../SearchResults';
 import { debounce } from 'lodash';
@@ -258,7 +258,6 @@ export class LeftPaneContactSection extends React.Component<Props, any> {
     );
   }
 
-
   // true: received only, false: sent only
   private getFriendRequests(
     received: boolean
diff --git a/ts/global.d.ts b/ts/global.d.ts
index 20d66f308..a73ce3010 100644
--- a/ts/global.d.ts
+++ b/ts/global.d.ts
@@ -15,7 +15,6 @@ interface Window {
   i18n: any;
   friends: any;
   generateID: any;
-  pushToast: any;
   storage: any;
   pushToast: any;
 }