You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/11/18 14:38:32 UTC

svn commit: r1543024 - /openoffice/branches/rejuvenate01/main/configure.in

Author: hdu
Date: Mon Nov 18 13:38:32 2013
New Revision: 1543024

URL: http://svn.apache.org/r1543024
Log:
remove merge conflict marker

Modified:
    openoffice/branches/rejuvenate01/main/configure.in

Modified: openoffice/branches/rejuvenate01/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configure.in?rev=1543024&r1=1543023&r2=1543024&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configure.in (original)
+++ openoffice/branches/rejuvenate01/main/configure.in Mon Nov 18 13:38:32 2013
@@ -3963,7 +3963,6 @@ if test "$_os" = "Darwin" && test "$with
 		AC_MSG_ERROR([Python 2.7.1 or higher is required])
    fi
 
->>>>>>> .merge-right.r1543013
    PYTHON_LIBS="-framework Python"
 elif test -n "$with_system_python" -o -n "$with_system_libs" && \
 	test "$with_system_python" != "no"; then