[vidalia-svn] r3807: Fix a previous merge conflict. (vidalia/branches/breakpad/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-06-01 01:13:46 -0400 (Mon, 01 Jun 2009)
New Revision: 3807

Modified:
   vidalia/branches/breakpad/src/vidalia/CMakeLists.txt
Log:

Fix a previous merge conflict.


Modified: vidalia/branches/breakpad/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/breakpad/src/vidalia/CMakeLists.txt	2009-05-31 00:19:22 UTC (rev 3806)
+++ vidalia/branches/breakpad/src/vidalia/CMakeLists.txt	2009-06-01 05:13:46 UTC (rev 3807)
@@ -448,15 +448,12 @@
 if (USE_MINIUPNPC)
   target_link_libraries(${vidalia_BIN} miniupnpc)
 endif(USE_MINIUPNPC)
-<<<<<<< .working
 if (USE_BREAKPAD)
   target_link_libraries(${vidalia_BIN} ${BREAKPAD_LIBRARIES})
 endif(USE_BREAKPAD)
-=======
 if (USE_MARBLE)
   target_link_libraries(${vidalia_BIN} ${MARBLE_LIBRARIES})
 endif(USE_MARBLE)
->>>>>>> .merge-right.r3755
 
 if (WIN32)
   target_link_libraries(${vidalia_BIN}