solving merge conflict

2014-02-05 21:21:00 -03:00
parent 6fe9dcf578 58390dfb92
commit 29acc46d34
20 changed files with 427 additions and 143 deletions
--- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapService.java
@@ -46,8 +46,6 @@ public interface MindmapService {

    void removeCollaboration(@NotNull Mindmap mindmap, @NotNull Collaboration collaboration) throws CollaborationException;

-    void addTags(@NotNull Mindmap mindmap, String tags);
-
    void removeMindmap(@NotNull final Mindmap mindmap, @NotNull final User user) throws WiseMappingException;

    List<Mindmap> search(MindMapCriteria criteria);