[Lunar-commits] <moonbase> updated conflicts in firefox and thunderbird

[Zbigniew Luszpinski]

commit 7e6ce44c948cc522d5ff6fc6db248f78dea1c64a
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Mon Jul 4 23:27:43 2011 +0200

    updated conflicts in firefox and thunderbird
---
 mail/thunderbird/CONFLICTS |    1 +
 web/firefox/CONFLICTS      |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/mail/thunderbird/CONFLICTS b/mail/thunderbird/CONFLICTS
new file mode 100644
index 0000000..6fe7cea
--- /dev/null
+++ b/mail/thunderbird/CONFLICTS
@@ -0,0 +1 @@
+conflicts thunderbird5
diff --git a/web/firefox/CONFLICTS b/web/firefox/CONFLICTS
index 662fd5c..61c7301 100644
--- a/web/firefox/CONFLICTS
+++ b/web/firefox/CONFLICTS
@@ -1 +1 @@
-conflicts firefox4
+conflicts firefox5