From 6e9730fc3d9077096330eb3a56590041f6794dc4 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 17 Mar 2026 11:22:55 +0100
Subject: remove merge artifact on branch 6.1 from 343a471f, re #6330

---
 app/views/course/topics/index.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/course/topics/index.php b/app/views/course/topics/index.php
index 503ddd8..6cc5e92 100644
--- a/app/views/course/topics/index.php
+++ b/app/views/course/topics/index.php
@@ -6,7 +6,6 @@
  */
 ?>
 <? if (count($topics) > 0) : ?>
-<<<<<<< HEAD
 <table class="default withdetails">
     <colgroup>
         <col width="50%">
-- 
cgit v1.0