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