From c5cbfebcef11fc1dca19b5146a3c7beaaaf530a4 Mon Sep 17 00:00:00 2001
From: karoel2 <karoel123@gmail.com>
Date: Wed, 15 Jun 2022 09:04:47 +0200
Subject: [PATCH] resolve merge conflict"

---
 system/taktyka_dialogu.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/system/taktyka_dialogu.py b/system/taktyka_dialogu.py
index eeac367..46015b7 100644
--- a/system/taktyka_dialogu.py
+++ b/system/taktyka_dialogu.py
@@ -68,13 +68,8 @@ def long_thread(state):
     opt_args = add_facts(opt_args, facts)
     required_empty = check_req(req_args)
     if required_empty:
-<<<<<<< HEAD
         return False, required_empty[0] #slot do uzupełnienia
     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):
     req = []