-
Andrea Cascallar Fuentes authored
# 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
5f565c1e