From: Greg Gay <ggay@ocad.ca>
Date: Wed, 21 Sep 2011 17:54:49 +0000 (-0400)
Subject: Merge branches 'master' and 'new_feature' into new_feature
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=atutor.git;a=commitdiff_plain;h=416c2133476d1f67ea5afaa2334ae91f958d8808;hp=75de1b5ae3e1b71948db927e465f77f0d278cdff

Merge branches 'master' and 'new_feature' into new_feature
---

diff --git a/bundle.sh b/bundle.sh
index 6df3381b7..e71ab0460 100755
--- a/bundle.sh
+++ b/bundle.sh
@@ -1,4 +1,4 @@
-#! /bin/csh -f
+# /bin/csh -f
 #########################################################################
 # ATutor bundle script                                                  #
 # ./bundle [VERSION] to specify an optional version number              #
@@ -11,6 +11,8 @@
 # This script retreives a copy of the latest English language from the atutor.ca language database via wget.
 #
 
+
+
 set now = `date +"%Y_%m_%d"`
 set atutor_dir = "ATutor_$now"
 set bundle = "ATutor"
@@ -149,4 +151,4 @@ echo " >> Did you update check_atutor_version.php ?? <<"
 echo "Bundle complete. Enjoy.Exiting."
 
 
-exit 1
\ No newline at end of file
+exit 1