From 9365f551a7487180986283a9eaba15b75e2c99e2 Mon Sep 17 00:00:00 2001
From: Andreas <6977712+AndreasK79@users.noreply.github.com>
Date: Tue, 5 Oct 2021 19:24:50 +0200
Subject: [PATCH] Removed lines that should not be there. Problably comes from
 a merge.

---
 application/views/view_log/qso.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php
index f826b83a..4b4b3569 100644
--- a/application/views/view_log/qso.php
+++ b/application/views/view_log/qso.php
@@ -144,24 +144,19 @@
                     </tr>
                     <?php } ?>
 
-<<<<<<< HEAD
-                    <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
-=======
                     <?php if($row->COL_CNTY != null && $row->COL_CNTY != ",") { ?>
                         <tr>
                             <td>USA County:</td>
                             <td><?php echo $row->COL_CNTY; ?></td>
                         </tr>
                     <?php } ?>
->>>>>>> 9e058dac9a7454cebd80396e5de94ae445eed096
 
-                        <?php if($row->COL_NAME != null) { ?>
+                    <?php if($row->COL_NAME != null) { ?>
                     <tr>
                         <td><?php echo $this->lang->line('general_word_name'); ?></td>
                         <td><?php echo $row->COL_NAME; ?></td>
                     </tr>
                     <?php } ?>
-                    <?php } ?>
 
                     <?php if(($this->config->item('use_auth') && ($this->session->userdata('user_type') >= 2)) || $this->config->item('use_auth') === FALSE) { ?>
                     <?php if($row->COL_COMMENT != null) { ?>