diff options
| -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%"> |