From c093abfb3344b68d501d30983c662b74590ab72c Mon Sep 17 00:00:00 2001
From: "info@skl.me" <info@skl.me@f2a461e8-04e4-11de-bcc6-d9108be23e13>
Date: Wed, 19 Feb 2014 20:34:52 +0000
Subject: [PATCH] Fix svn merge conflicts

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@33 f2a461e8-04e4-11de-bcc6-d9108be23e13
---
 apt-cyg | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/apt-cyg b/apt-cyg
index 39ef17e..1fcd054 100644
--- a/apt-cyg
+++ b/apt-cyg
@@ -99,15 +99,6 @@ function findworkspace()
 
 function getsetup() 
 {
-
-  ARCH=`uname -m | grep _64`
-  if test "-$ARCH-" = "--"
-  then
-    arch="x86"
-  else
-    arch="x86_64"
-  fi
-
   if test "$noscripts" == "0" -a "$noupdate" == "0"
   then
     touch setup.ini