diff options
| author | Guilhem Moulin <guilhem.moulin@ens-lyon.org> | 2012-02-17 17:41:24 +0100 |
|---|---|---|
| committer | Guilhem Moulin <guilhem.moulin@ens-lyon.org> | 2012-02-17 17:41:24 +0100 |
| commit | b65208a3613dbe72c225821b5832d4645d667d3f (patch) | |
| tree | 6174d1f2e3647403fc10ed72b89db001d7572c09 /videodb.rc | |
| parent | 7afca45ce9dc21300cffa2d6636eb0d69eecf1cb (diff) | |
| parent | c999a5247f868b4de1c64de30bcf9bde4a0ceeab (diff) | |
Merge branch 'videoadd' 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 | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -11,3 +11,9 @@ user => 'username', port => 3306, password => '******', videodata => "videodb_videodata", +<<<<<<< HEAD +======= +imdb => 'akas.imdb.com', +url => 'https://videodb.example.org' + +>>>>>>> origin/videoadd |