Fix svn merge conflicts

git-svn-id: https://apt-cyg.googlecode.com/svn/trunk@33 f2a461e8-04e4-11de-bcc6-d9108be23e13
2014-02-19 20:34:52 +00:00 · 2014-02-19 20:34:52 +00:00 · c093abfb33
parent 58b348157b
commit c093abfb33
1 changed files with 0 additions and 9 deletions
--- a/9
+++ b/9
@ -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