summaryrefslogtreecommitdiffstats
path: root/videodb.rc
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem.moulin@ens-lyon.org>2012-02-17 17:42:27 +0100
committerGuilhem Moulin <guilhem.moulin@ens-lyon.org>2012-02-17 17:42:27 +0100
commit905ae94b67d7aad20b970d2e34778890ff6a5d16 (patch)
tree22da312c98db237977997e29cf247ebb7aed88de /videodb.rc
parentb65208a3613dbe72c225821b5832d4645d667d3f (diff)
parentdb842af5629fce914a087df1ba536a63d4eaf87e (diff)
Merge branch 'videomv' of ssh://guilhem.org/home/git/public/videodb-tools into videodb-check
Conflicts: videodb.rc
Diffstat (limited to 'videodb.rc')
-rw-r--r--videodb.rc4
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