From e8e45eb8f686c9e90c94947b566357c71d19eb9e Mon Sep 17 00:00:00 2001
From: thor <thor@35dc7657-300d-0410-a2e5-dc2837fedb53>
Date: Fri, 18 Jun 2010 06:55:48 +0000
Subject: [PATCH] fix the bad merge of lfs_alias.c

git-svn-id: svn://scm.orgis.org/mpg123/trunk@2740 35dc7657-300d-0410-a2e5-dc2837fedb53
---
 src/libmpg123/lfs_alias.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/libmpg123/lfs_alias.c b/src/libmpg123/lfs_alias.c
index 1a5a1fd4..e9d9789f 100644
--- a/src/libmpg123/lfs_alias.c
+++ b/src/libmpg123/lfs_alias.c
@@ -91,23 +91,6 @@ EOT
 }' < mpg123.h.in
 */
 
-<<<<<<< .working
-int attribute_align_arg ALIAS_NAME(mpg123_open)(mpg123_handle *mh, const char *path)
-{
-	return mpg123_open(mh, path);
-}
-
-int attribute_align_arg ALIAS_NAME(mpg123_open_fd)(mpg123_handle *mh, int fd)
-{
-	return mpg123_open_fd(mh, fd);
-}
-
-int attribute_align_arg ALIAS_NAME(mpg123_open_handle)(mpg123_handle *mh, void *iohandle)
-{
-	return mpg123_open_handle(mh, iohandle);
-}
-
-=======
 #ifdef mpg123_open
 #undef mpg123_open
 #endif
@@ -135,7 +118,6 @@ int attribute_align_arg ALIAS_NAME(mpg123_open_handle)(mpg123_handle *mh, void *
 #ifdef mpg123_decode_frame
 #undef mpg123_decode_frame
 #endif
->>>>>>> .merge-rechts.r2735
 int attribute_align_arg ALIAS_NAME(mpg123_decode_frame)(mpg123_handle *mh, long *num, unsigned char **audio, size_t *bytes)
 {
 	return NATIVE_NAME(mpg123_decode_frame)(mh, num, audio, bytes);