Fixes merge conflicts

MagLev · Feb 17, 2015 · 20c4fd2 · 20c4fd2
2 parents 8fda9da + f2c8b27
commit 20c4fd2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ src/test/test_data/Trac781.gz
 rubyspec_temp
 fileintmp
 gemstone
+gemstone_versions
 src/kernel/parser/byacc/*.o
 src/kernel/parser/byacc/config.h
 src/kernel/parser/byacc/config.status

diff --git a/.travis.yml b/.travis.yml
@@ -16,3 +16,10 @@ env:
 notifications:
     email: false
     irc: "irc.freenode.org#maglev-ruby"
+    webhooks:
+      urls:
+        - https://webhooks.gitter.im/e/40b9abc1ab238ef1ebb2
+        on_success: change
+        on_failure: always
+        on_start: false
+
diff --git a/bin/maglev-ruby b/bin/maglev-ruby
@@ -2,7 +2,7 @@
 #
 # Runs a ruby file using the MagLev VM
 #
-# Copyright 2009-2010 GemStone Systems, Inc. All rights reserved.
+# Copyright 2009-2015 GemTalk Systems, Inc. All rights reserved.
 
 export LANG=C  # see https://github.com/MagLev/maglev/issues/93
 
@@ -150,7 +150,7 @@ function parseArgs {
                 cd ${1:2} || usage "${1:2}: bad directory"
                 ;;
             --copyright)
-                echo "maglev - Copyright 2008-2010 GemStone Systems, Inc."
+                echo "maglev - Copyright 2008-2015 GemTalk Systems, Inc."
                 exit
                 ;;
             -d|--debug)