diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2026-03-17 11:22:55 +0100 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2026-03-17 11:22:55 +0100 |
| commit | 6e9730fc3d9077096330eb3a56590041f6794dc4 (patch) | |
| tree | 5c8d405bac52f2e92131065a76d7c88b54eef66f | |
| parent | 44ab3b2cbe1144a1acf3f829480c112843a3d158 (diff) | |
remove merge artifact on branch 6.1 from 343a471f, re #6330
| -rw-r--r-- | app/views/course/topics/index.php | 1 |
1 files changed, 0 insertions, 1 deletions
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%"> |