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