From 40adced263f0ab2c899add2812060697092a6804 Mon Sep 17 00:00:00 2001 From: josh Date: Sun, 11 May 2014 22:03:20 -0700 Subject: [PATCH 1/2] added trommel function --- socode.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/socode.py b/socode.py index f1e3472..061d900 100755 --- a/socode.py +++ b/socode.py @@ -1698,7 +1698,10 @@ def mapleray(): def romibuzi(): print "From Paris with love !" - + +def trommel(): + print "ogres are like onions" + def avalanchy(): print 'Hello from avalanchy'+(1**2>>3*4%5/6<<7+8-9)*'!' @@ -1933,6 +1936,7 @@ def nikitachernov(): papachan() akkatracker() nikitachernov() + trommel() # If you add a call to your function here you will # hit a merge conflict. Instead if you add your # call some place random wihin the list or at the From 2874fca0bc21b590e394cd35aaf3cf58a6ec9873 Mon Sep 17 00:00:00 2001 From: Josh Trommel Date: Sun, 22 Mar 2015 22:53:11 -0700 Subject: [PATCH 2/2] fixed my username --- socode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/socode.py b/socode.py index 061d900..72d9b4d 100755 --- a/socode.py +++ b/socode.py @@ -1699,7 +1699,7 @@ def mapleray(): def romibuzi(): print "From Paris with love !" -def trommel(): +def probablyjosh(): print "ogres are like onions" def avalanchy(): @@ -1936,7 +1936,7 @@ def nikitachernov(): papachan() akkatracker() nikitachernov() - trommel() + probablyjosh() # If you add a call to your function here you will # hit a merge conflict. Instead if you add your # call some place random wihin the list or at the