Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
#	src/main/java/simplenlg/aggregation/AggregationRule.java
#	src/main/java/simplenlg/aggregation/ClauseCoordinationRule.java
#	src/main/java/simplenlg/framework/CoordinatedPhraseElement.java
#	src/main/java/simplenlg/framework/NLGFactory.java
#	src/main/java/simplenlg/lexicon/Lexicon.java
#	src/main/java/simplenlg/realiser/Realiser.java
#	src/main/resources/default-galician-lexicon.xml
#	src/test/java/simplenlg/external/english/ExternalTest.java
#	src/test/java/simplenlg/external/galician/ExternalTest.java
#	src/test/java/simplenlg/realiser/english/RealiserTest.java
#	src/test/java/simplenlg/syntax/english/AdjectivePhraseTest.java
#	src/test/java/simplenlg/syntax/english/ClauseTest.java
#	src/test/java/simplenlg/syntax/english/FeatureTest.java
#	src/test/java/simplenlg/syntax/english/InterrogativeTest.java
#	src/test/java/simplenlg/syntax/english/NounPhraseTest.java
#	src/test/java/simplenlg/syntax/english/PremodifierTest.java
#	src/test/java/simplenlg/syntax/english/PrepositionalPhraseTest.java
#	src/test/java/simplenlg/syntax/english/StringElementTest.java
#	src/test/java/simplenlg/syntax/english/TutorialTest.java
#	src/test/java/simplenlg/syntax/galician/InterrogativeTest2.java
#	src/test/java/simplenlg/syntax/spanish/InterrogativeTest.java
parent e45e88aa
Pipeline #1954 passed with stage
in 1 minute and 24 seconds
This diff is collapsed.
......@@ -292316,7 +292316,11 @@
<base>quen</base>
<category>pronoun</category>
<gender>neuter</gender>
<<<<<<< HEAD
<number>singular</number>
=======
<number>both</number>
>>>>>>> origin/master
<person>none</person>
</word>
<word>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment