resolve merge conflict"
This commit is contained in:
parent
a7cdae8859
commit
c5cbfebcef
@ -68,13 +68,8 @@ def long_thread(state):
|
|||||||
opt_args = add_facts(opt_args, facts)
|
opt_args = add_facts(opt_args, facts)
|
||||||
required_empty = check_req(req_args)
|
required_empty = check_req(req_args)
|
||||||
if required_empty:
|
if required_empty:
|
||||||
<<<<<<< HEAD
|
|
||||||
return False, required_empty[0] #slot do uzupełnienia
|
return False, required_empty[0] #slot do uzupełnienia
|
||||||
return True, act, req_args, opt_args #wyświetl użytkownikowi
|
return True, act, req_args, opt_args #wyświetl użytkownikowi
|
||||||
=======
|
|
||||||
return "QUESTION", required_empty[0] #slot do uzupełnienia
|
|
||||||
return "ANSWER", act, req_args, opt_args #wyświetl użytkownikowi
|
|
||||||
>>>>>>> 9d13e02f6560790e8c2d17624ae15100269363fd
|
|
||||||
|
|
||||||
def check_req(req_args):
|
def check_req(req_args):
|
||||||
req = []
|
req = []
|
||||||
|
Loading…
Reference in New Issue
Block a user