merge fixes

dashboard-reddit.env.html

@@ -52,7 +52,11 @@
             <number-chart 
               icon="/images/news.ico"
               stylebg="bg-yellow"
+<<<<<<< HEAD
               title="Selected elements"
+=======
+              title="News selected"
+>>>>>>> 9575f09c4cfbf975c275bacc6dc603bc856e7992
               data="{{data}}">
             </number-chart>
           </div>
@@ -217,7 +221,11 @@
     </div>
     <div>
         <yasgui-ui
+<<<<<<< HEAD
        endpoint="http:///${FUSEKI_ENDPOINT_DASHBOARD}/gsicrawler/query"
+=======
+       endpoint="http:///krusti.gsi:13030/gsicrawler/query"
+>>>>>>> 9575f09c4cfbf975c275bacc6dc603bc856e7992
        queries="{{queries}}">
         </yasgui-ui>
     </div>

demo/elements/news-chart/news-chart.html

@@ -30,6 +30,7 @@
               </div>
               <div class="col-md-3">
                 <span style="text-align:center;padding-left: 16%;">{{getDate(news.schema:datePublished)}}</span><iron-icon style="left:96%; top: 8px;" icon="icons:search">
+
               </div>
             </div>        
             </div>