[Lunar-commits] <moonbase> ffmpeg(svn): added conflicts file ffmpeg<->ffmpeg-svn

[Zbigniew Luszpinski]

commit d9221a807a2c9373940b91d6031fbfb321aaf0d4
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat May 31 19:03:21 2008 +0200

    ffmpeg(svn): added conflicts file ffmpeg<->ffmpeg-svn
---
 video/ffmpeg/CONFLICTS     |    1 +
 zbeta/ffmpeg-svn/CONFLICTS |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/video/ffmpeg/CONFLICTS b/video/ffmpeg/CONFLICTS
new file mode 100644
index 0000000..53a236c
--- /dev/null
+++ b/video/ffmpeg/CONFLICTS
@@ -0,0 +1 @@
+conflicts ffmpeg-svn
diff --git a/zbeta/ffmpeg-svn/CONFLICTS b/zbeta/ffmpeg-svn/CONFLICTS
new file mode 100644
index 0000000..3d77e2c
--- /dev/null
+++ b/zbeta/ffmpeg-svn/CONFLICTS
@@ -0,0 +1 @@
+conflicts ffmpeg