diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2007-03-02 13:33:39 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2007-03-02 13:33:39 +0000 |
| commit | 5e1e68c06852a560f7b5c4cef88e9b758bd81871 (patch) | |
| tree | 470deed3fe41863e0a7de85ed02aff65db3f382b /ext/nas/nassink.c | |
| parent | 6ffee3230a7bde00c690fa7467e1b1442c89cba3 (diff) | |
| download | gst-plugins-bad-5e1e68c06852a560f7b5c4cef88e9b758bd81871.tar.gz gst-plugins-bad-5e1e68c06852a560f7b5c4cef88e9b758bd81871.tar.bz2 gst-plugins-bad-5e1e68c06852a560f7b5c4cef88e9b758bd81871.zip | |
Remove spurious conflict marker
Original commit message from CVS:
Remove spurious conflict marker
Diffstat (limited to 'ext/nas/nassink.c')
0 files changed, 0 insertions, 0 deletions