@@ -302,10 +302,6 @@ var entSearch = new Vue({
getBIParams () {
const urlParams = new URLSearchParams(window.location.search)
return urlParams.get('resource')
-<<<<<<< HEAD
-
-=======
->>>>>>> feature/v4.8.75
}
},
created: function () {
