Move project-1

project-1/solution.pl

@@ -352,6 +352,7 @@ selec/4 predicate.
 For “INSERT”, nothing needs to be printed by query/1 or in case of
 success, and if query/2 is used the Result parameter can be ignored.
 */
+<<<<<<< HEAD:solution.pl
 query(Query, Result):-
 	parse_query(Query, Fun, Args),
 	apply(Fun, Args),
@@ -482,6 +483,10 @@ parse_cond( +AtomLeft=AtomRight, Cond):-
 is_number(R, N):-
 	atom_number(N, R); R = N.
 
+=======
+query(Query, Result, Rest) :-
+	prolog_term(Result, [';']). 
+>>>>>>> d17a9b1 (Move project-1):project-1/solution.pl
 
 :- dynamic query/1.
 /*