diff options
author | Guilhem Moulin <guilhem.moulin@ens-lyon.org> | 2012-02-17 17:42:27 +0100 |
---|---|---|
committer | Guilhem Moulin <guilhem.moulin@ens-lyon.org> | 2012-02-17 17:42:27 +0100 |
commit | 905ae94b67d7aad20b970d2e34778890ff6a5d16 (patch) | |
tree | 22da312c98db237977997e29cf247ebb7aed88de /videodb.rc | |
parent | b65208a3613dbe72c225821b5832d4645d667d3f (diff) | |
parent | db842af5629fce914a087df1ba536a63d4eaf87e (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.rc | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -11,9 +11,5 @@ user => 'username', port => 3306, password => '******', videodata => "videodb_videodata", -<<<<<<< HEAD -======= imdb => 'akas.imdb.com', url => 'https://videodb.example.org' - ->>>>>>> origin/videoadd |