Item13883: Avoid a merge conflict

foswiki · Apr 10, 2016 · 0726179 · 0726179
1 parent 0cf467d
commit 0726179
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/core/data/System/PerlDependencyReport.txt b/core/data/System/PerlDependencyReport.txt
@@ -16,19 +16,18 @@ resolution.  Optional or "recommended" dependencies will note when they are
 needed, and should only be installed if you know that your particular
 installation will require them.</div>
 
-%IF{"$include='all'" else="
-$percntBUTTON{
-  \"Show all dependencies\"
-  icon=\"book\"
-  onclick=\"window.location.href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?include=all';\"
-}$percnt" then="
-$percntBUTTON{
-  \"Show only missing dependencies\"
-  icon=\"book\"
-  onclick=\"window.location.href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?include=missing';\"
-}$percnt
-"}%
-
+%IF{"$include='all'" 
+   else="$percntBUTTON{
+      \"Show all dependencies\"
+      icon=\"book\"
+      onclick=\"window.location.href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?include=all';\"
+   }$percnt" 
+   then="$percntBUTTON{
+      \"Show only missing dependencies\"
+      icon=\"book\"
+      onclick=\"window.location.href='%SCRIPTURL{"view"}%/%WEB%/%TOPIC%?include=missing';\"
+   }$percnt"
+}%
 
 %TOC%