From ebb5a7cf16560eb1c259ea604e82f29a3f784707 Mon Sep 17 00:00:00 2001
From: Balazs Gobel <balazs.gobel@tretton37.com>
Date: Mon, 25 Feb 2019 12:59:02 +0100
Subject: [PATCH] Additional merge conflict fixes

---
 src/main.less | 4 ++++
 src/paint.jsx | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main.less b/src/main.less
index 13db120..ac01c42 100644
--- a/src/main.less
+++ b/src/main.less
@@ -20,6 +20,10 @@
     line-height: 1em !important;
   }
 
+  div.qv-object-content-container {
+    z-index: 110;
+  }
+
   .tooltip-wrapper {
     min-width: 25px;
     position: fixed;
diff --git a/src/paint.jsx b/src/paint.jsx
index deb50b1..50586f4 100644
--- a/src/paint.jsx
+++ b/src/paint.jsx
@@ -1,4 +1,3 @@
-import $ from 'jquery'; // eslint-disable-line id-length
 import initializeStore from './store';
 import React from 'react';
 import ReactDOM from 'react-dom';