# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1304514398 0
# Node ID 1fd93ac9266952199b07890c1e9e17039b8a2ddd
# Parent  7df2902ad4d7a6abe9b05fe09ee01c7742b131d6
Fixed tazwok merge.

diff -r 7df2902ad4d7 -r 1fd93ac92669 tazwok
--- a/tazwok	Wed May 04 13:01:48 2011 +0000
+++ b/tazwok	Wed May 04 13:06:38 2011 +0000
@@ -286,21 +286,6 @@
 	fi
 }
 
-<<<<<<< local
-=======
-check_for_pkg_in_wok()
-{
-	[ -f $WOK/$PACKAGE/receipt ] && return
-	if [ "$undigest" ]; then
-		[ -f "$SLITAZ_DIR/$SLITAZ_VERSION/wok/$PACKAGE/receipt" ] && return 1
-		grep -q ^$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages/packages.txt && return 1
-	fi
-	[ -f $WOK/$(whoprovide $PACKAGE)/receipt ] && return 1
-	echo "Can't find $PACKAGE in wok or mirror" >&2
-	return 2
-}
-
->>>>>>> other
 ########################################################################
 # TAZWOK CORE FUNCTIONS
 ########################