[UPDATE] fixed divs

public/templates/bootstrap/account/transactions/default.tpl

@@ -121,4 +121,4 @@
       </div>
     </div>
   </div>
-<div
+<div>

public/templates/bootstrap/statistics/blocks/block_shares_graph.tpl

@@ -3,11 +3,7 @@ $(function () {
 
       var blockdata = [
         {section block $BLOCKSFOUND step=-1}{ldelim}
-<<<<<<< Updated upstream
           blockHeight:    {$BLOCKSFOUND[block].height},
-=======
-          blockHeight:   "{$BLOCKSFOUND[block].height}",
->>>>>>> Stashed changes
           estShares:      {$BLOCKSFOUND[block].estshares},
           actShares:      {$BLOCKSFOUND[block].shares|default:"0"},
           {if $USEBLOCKAVERAGE}
@@ -16,7 +12,6 @@ $(function () {
           {if $GLOBAL.config.payout_system == 'pplns'}
           pplnsShares:    {$BLOCKSFOUND[block].pplns_shares|default:"0"},
           {/if}
-<<<<<<< Updated upstream
           {rdelim},
         {/section}
       ];
@@ -24,32 +19,18 @@ $(function () {
       Morris.Area({
         parseTime: false,
         behaveLikeLine: true,
-=======
-          {rdelim},                
-        {/section}
-      ];
-                  
-      Morris.Area({
->>>>>>> Stashed changes
         element: 'block-area-chart',
         data: blockdata,
         xkey: 'blockHeight',
         ykeys : ['estShares', {if $USEBLOCKAVERAGE}'avgShares', {/if}{if $GLOBAL.config.payout_system == 'pplns'}'pplnsShares', {/if} 'actShares'],
         labels : ['Expected Shares', {if $USEBLOCKAVERAGE}'Average Shares', {/if}{if $GLOBAL.config.payout_system == 'pplns'}'PPLNS Shares',{/if} 'Actual Shares'],
         pointSize: 2,
-<<<<<<< Updated upstream
         lineColors: ['#2D9C2F','#D58665','#2D619C','#FF0000'],
         pointFillColors: ['#FFFFFF'],
         hideHover: 'auto',
         resize: true,
         fillOpacity: 0.05
       });
-=======
-        hideHover: 'auto',
-        resize: true
-      });
-      
->>>>>>> Stashed changes
 });
 </script>