Commit 6c35c0a3 authored by Alberto Pascual's avatar Alberto Pascual
Browse files

merge fixes

parents b1aee6b4 f320b335
......@@ -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>
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment