Fixed a couple of typos in merge

geosolutions-it · May 18, 2018 · 5a403ea · 5a403ea
1 parent e75eec9
commit 5a403ea
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/web/client/components/map/openlayers/VectorStyle.js b/web/client/components/map/openlayers/VectorStyle.js
@@ -15,7 +15,6 @@ const image = new ol.style.Circle({
 });
 
 const Icons = require('../../../utils/openlayers/Icons');
-const {colorToRgbaStr} = require('../../../utils/ColorUtils');
 
 const STYLE_POINT = {
     color: '#ffcc33',

diff --git a/web/client/themes/default/less/common.less b/web/client/themes/default/less/common.less
@@ -151,7 +151,6 @@ textarea {
 .ms2-border-layout-content {
     background-color: @ms2-color-background;
 }
-<< HEAD
 .mapstore-filter {
        &.form-group {
            margin: (@square-btn-size - @square-btn-medium-size)/2 0 0 0;