On 03/01/11 11:13, Dave Reisner wrote:
Signed-off-by: Dave Reisner<[email protected]> --- configure.ac | 22 +---- lib/libalpm/alpm.c | 12 --- lib/libalpm/dload.c | 264 +-------------------------------------------------- 3 files changed, 6 insertions(+), 292 deletions(-)diff --git a/configure.ac b/configure.ac index 3d536cd..23120e3 100644 --- a/configure.ac +++ b/configure.ac @@ -93,11 +93,14 @@ AC_ARG_WITH(openssl, AS_HELP_STRING([--with-openssl], [use OpenSSL crypto implementations instead of internal routines]), [], [with_openssl=check]) +<<<<<<< HEAD # Help line for libfetch AC_ARG_WITH(fetch, AS_HELP_STRING([--with-fetch], [use libfetch as an internal downloader]), [], [with_fetch=no]) +======= +>>>>>>> 62cb945... Perform a fetch-ectomy, removing libfetch entirely
Looks like you did not finish a merge here. Allan
