[webanno/webanno] cb7619: #1795 - chili - [Experimental] [Curation] Wrong me...

[GitHub]

Branch: refs/heads/master
Home: https://github.com/webanno/webanno
Commit: cb7619a8d6370742699b5044a54b0d0dbf975320
https://github.com/webanno/webanno/commit/cb7619a8d6370742699b5044a54b0d0dbf975320
Author: seyyaw <seid...@gmail.com>
Date: 2015-10-19 (Mon, 19 Oct 2015)

Changed paths:
M webanno-brat/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/curation/component/model/SuggestionBuilder.java

Log Message:
-----------
#1795 - chili - [Experimental] [Curation] Wrong merging of
span-instances with slot feature


Commit: 25bed5cbc9b062e9416781d6a42c2e0d896f20f8
https://github.com/webanno/webanno/commit/25bed5cbc9b062e9416781d6a42c2e0d896f20f8
Author: seyyaw <seid...@gmail.com>
Date: 2015-10-19 (Mon, 19 Oct 2015)

Changed paths:
M webanno-webapp/src/main/java/de/tudarmstadt/ukp/clarin/webanno/webapp/dialog/OpenModalWindowPanel.html

Log Message:
-----------
Merge branch 'master' of https://github.com/webanno/webanno.git


Compare: https://github.com/webanno/webanno/compare/c794ff307090...25bed5cbc9b0