From 816d45ddc9e813642b9dd547949e17c7950dbacf Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Mon, 25 May 2020 17:41:37 +0200
Subject: [PATCH] OO-4705: Fix merge conflicts
---
src/main/java/org/olat/modules/wiki/WikiMainController.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/main/java/org/olat/modules/wiki/WikiMainController.java b/src/main/java/org/olat/modules/wiki/WikiMainController.java
index b9415ad12c5..8583955d31d 100644
--- a/src/main/java/org/olat/modules/wiki/WikiMainController.java
+++ b/src/main/java/org/olat/modules/wiki/WikiMainController.java
@@ -404,13 +404,8 @@ public class WikiMainController extends BasicController implements CloneableCont
}
wikiMenuDropdown.removeAllComponents();
-<<<<<<< HEAD
for (WikiPage page : pages) {
String link = page.getPageName();
-=======
- for (String link : links) {
-// link = Formatter.truncate(link, 60);
->>>>>>> refs/heads/OpenOLAT_14.2
Link menuLink = LinkFactory.createToolLink(link, "select-page", link, this);
menuLink.setElementCssClass("o_wiki_menu");
wikiMenuDropdown.addComponent(menuLink);
--
GitLab