From fa01a4196a2ec9866dfaa7d3be0d9b8c244b6df6 Mon Sep 17 00:00:00 2001
From: vpapako <vpapako@gmail.com>
Date: Wed, 7 Feb 2018 13:54:53 +0200
Subject: [PATCH] fix virtuoso.ini conflict

---
 system/virtuoso.ini.template | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/system/virtuoso.ini.template b/system/virtuoso.ini.template
index 695bb7e..7cc63fc 100644
--- a/system/virtuoso.ini.template
+++ b/system/virtuoso.ini.template
@@ -240,11 +240,7 @@ DefaultHost			= localhost:8890
 ;DefaultGraph      		= http://localhost:8890/dataspace
 ;ImmutableGraphs    		= http://localhost:8890/dataspace
 ResultSetMaxRows           	= 100000000
-<<<<<<< HEAD
 MaxQueryCostEstimationTime 	= 4000	; in seconds
-=======
-MaxQueryCostEstimationTime 	= 400	; in seconds
->>>>>>> master
 MaxQueryExecutionTime      	= 600	; in seconds
 DefaultQuery               	= select distinct ?Concept where {[] a ?Concept} LIMIT 100
 DeferInferenceRulesInit    	= 0  ; controls inference rules loading