risoluzione conflitti merge

index.html

@@ -80,18 +80,6 @@
           <div class="col-sm-4">
             <div class="well" id="mappa-pannel">
               <h2>XRF Image</h2>
-<<<<<<< HEAD
-              <div style="position: relative;">
-                <canvas id="myCanvas"
-                  onmousedown="findPosDown(event);"
-                  onmouseup="findPosUp(event);"
-                  style="position: absolute; left: 0, top: 0; z-index:0">
-                  Browser doesn't support canvas tag
-                </canvas>
-                <canvas id="selectionCanvas"
-                  style="position: absolute; left: 0; top: 0; z-index: 1;">
-                </canvas>
-=======
 
               <!-- Simbolo impostazioni -->
               <div data-toggle="collapse" data-target="#collapse-settings">
@@ -112,7 +100,6 @@
               <div style="position: relative; height=400px;">
                 <canvas id="selectionCanvas" height="400px" width="360px" onmousedown="findPosDown(event);" onmouseup="findPosUp(event);"></canvas>
                 <canvas id="myCanvas" height="400px" width="360px"></canvas>
->>>>>>> ModificheAspettoGrafico
               </div>
               <!-- ./canvas -->
 
@@ -133,10 +120,8 @@
               <!-- ./impostazini -->
 
             </div>
-<<<<<<< HEAD
-=======
             <!-- ./ pannello-mappa -->
->>>>>>> ModificheAspettoGrafico
+
 
           </div>
           <!-- ./mappa -->
@@ -231,11 +216,7 @@
 
     <footer>
       <p>© CHNET 2017</p>
-<<<<<<< HEAD
-      <img width="150" src="Logo-chnet.png" class="img-responsive center-block">
-=======
       <img width="100" src="Logo-chnet.png" class="img-responsive center-block">
->>>>>>> ModificheAspettoGrafico
     </footer>
 
     <!--Librerie -->

style.css

@@ -196,16 +196,6 @@
     float: right;
     margin-right: 10px;
   }
-<<<<<<< HEAD
-
-
-/* spinner */
-.fa{
-  position: absolute;
-  z-index: 999;
-  margin-top: 300px;
-}
-=======
   .panel-default {
     background-color: transparent;
     height: 50px;
@@ -242,5 +232,4 @@
     left: 0;
     bottom: 0;
     right: 0;
-  }
->>>>>>> ModificheAspettoGrafico
+  }
\ No newline at end of file