Projects >> Web-Karma >>4c170d20df1279c229018485d1a70359b74a459c

Chunk
Conflicting content
			query.append("PREFIX rr:\n");
			query.append("SELECT ?predicate (group_concat(?y; separator = \",\") as ?triplesMaps )\n");
			
<<<<<<< HEAD
			if (!context.isEmpty() && context.compareTo("") != 0)
			{
				query.append("FROM <");
				query.append(context);
				query.append(">\n");
			}
=======
			injectContext(context, query);
>>>>>>> 2fac06f0e089835dad57db1c7e9e9d0af5206720
			query.append("{\n");
			query.append("?x owl:sameAs ?aaa . \n"); 
			query.append("?aaa km-dev:hasData \"true\" .\n"); 
Solution content
			query.append("PREFIX rr:\n");
			query.append("SELECT ?predicate (group_concat(?y; separator = \",\") as ?triplesMaps )\n");			
			injectContext(context, query);
			query.append("{\n");
			query.append("?x owl:sameAs ?aaa . \n"); 
			query.append("?aaa km-dev:hasData \"true\" .\n"); 
File
TripleStoreUtil.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation