Skip to content
Permalink
Browse files
Fixed merge errors
  • Loading branch information
@mateussa
mateussa committed Nov 13, 2017
1 parent 680f00f commit d05e722db1a78fa9e925589a98a6648771848878
Showing 1 changed file with 0 additions and 5 deletions.
5 determineUserInput.py
View file
@@ -97,11 +97,7 @@ def respondQuestion(sentence):
elif newSentence[0] in ["what","whats"]:
response = executeWhat(sentence), 3
elif newSentence[0] == "are":
<<<<<<< HEAD
response = executeAre(sentence), 4

=======
response = executeAre(sentence)
elif newSentence[0] == "tell":
response = executeTell(sentence)
elif newSentence[0]== "do":
@@ -111,7 +107,6 @@ def respondQuestion(sentence):
elif newSentence[0]=="which":
response = executeWhich(sentence)

>>>>>>> b7a60192002be12cb4161f5a82a085f5b9b8f27e
return response

# ----------------------------------------------------------------------------------------------------------

0 comments on commit d05e722

Please sign in to comment.