From 07acf958c6a3deed61d0aa365e9075ae61b7222b Mon Sep 17 00:00:00 2001 From: Ben Mathew Date: Fri, 29 May 2015 18:37:56 -0400 Subject: [PATCH 1/2] Testing GitHub for Mac Syncing --- example.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example.rb b/example.rb index bc1a148..8b2bb99 100644 --- a/example.rb +++ b/example.rb @@ -2,4 +2,4 @@ puts 'Hello the second time!' puts "fixed conflict" puts 'Hi from Batman' -puts "Hi again from Batman in double quotes" +puts "Hi again from Batman with double quotes" From d8c8ba19c7f5dbee6932f79382106cd4689c1270 Mon Sep 17 00:00:00 2001 From: Ben Mathew Date: Fri, 29 May 2015 18:59:59 -0400 Subject: [PATCH 2/2] Making changes through the Terminal --- example.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/example.rb b/example.rb index 8b2bb99..3e4db16 100644 --- a/example.rb +++ b/example.rb @@ -3,3 +3,4 @@ puts "fixed conflict" puts 'Hi from Batman' puts "Hi again from Batman with double quotes" +puts "It is getting hot outside!"