[Lunar-commits] <moonbase> vigra: Fixing a botched merge.

[Dennis `stumbles` Veatch]

commit 617d51bea0b0a6503892de13832615ca22370bae
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun Aug 29 10:20:55 2010 -0400

    vigra: Fixing a botched merge.
---
 graphics/vigra/DEPENDS |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/graphics/vigra/DEPENDS b/graphics/vigra/DEPENDS
index 9f6e507..b0d4715 100644
--- a/graphics/vigra/DEPENDS
+++ b/graphics/vigra/DEPENDS
@@ -7,8 +7,4 @@ optional_depends "libpng"    ""  ""  "for png support"
 optional_depends "jpeg"      ""  ""  "for jpeg support"    
 optional_depends "openMotif" ""  ""  "for tiff support"    
 optional_depends "boost"     ""  ""  "for boost support"
-<<<<<<< HEAD
-optional_depends "Sphinx"    ""  ""  "for documentation generation support"
-=======
 optional_depends "Sphinx"    ""  ""  "for document generation support"
->>>>>>> master