revert previous patch

git-svn-id: svn:https://anonscm.debian.org/svn/pcsclite/trunk/PCSC@2868 0ce88b0d-b2fd-0310-8134-9614164e65ea
wangjun008xx · Apr 7, 2008 · 5cb192e · 5cb192e
1 parent ad95f3a
commit 5cb192e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/c.sh b/c.sh
@@ -13,11 +13,6 @@ CFLAGS="$CFLAGS -Wno-unused-parameter"
  --enable-usbdropdir=/usr/lib/pcsc/drivers \
  --enable-muscledropdir=/usr/lib/pcsc/services \
  --enable-maintainer-mode \
-<<<<<<< .mine
- --disable-libhal \
  --enable-twinserial \
-=======
- --enable-twinserial \
->>>>>>> .r2866
  CFLAGS="$CFLAGS" \
  "$@"