From 6516e5cc46e36859edc28e97ae0c44d79c5aea89 Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Thu, 26 Dec 2019 16:23:29 +0000
Subject: [PATCH] argh

---
 ext/log_db/main.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ext/log_db/main.php b/ext/log_db/main.php
index cfb13827..02c67c26 100644
--- a/ext/log_db/main.php
+++ b/ext/log_db/main.php
@@ -86,7 +86,6 @@ class ActorColumn extends Column
             }
         }
         return [$un, $ip];
->>>>>>> crud update
     }
 
     public function display($row)