1 files changed, 0 insertions, 4 deletions
diff --git a/videodb.rc b/videodb.rc
index 7babf8f..8a3ce70 100644
--- a/videodb.rc
+++ b/videodb.rc
@@ -11,9 +11,5 @@ user      => 'username',
 port      => 3306,
 password  => '******',
 videodata => "videodb_videodata",
-<<<<<<< HEAD
-=======
 imdb      => 'akas.imdb.com',
 url       => 'https://videodb.example.org'
-
->>>>>>> origin/videoadd