diff --git a/SuperSpiffyTool/SomeAwesomeCode.txt b/SuperSpiffyTool/SomeAwesomeCode.txt index 15e5310..63d6d45 100644 --- a/SuperSpiffyTool/SomeAwesomeCode.txt +++ b/SuperSpiffyTool/SomeAwesomeCode.txt @@ -1,5 +1,9 @@ This unit does not do anything useful, other than demonstrating managing local and upstream changes. function CoolStuff (int amountofcool) -if amountofcool > 200 +if amountofcool > 250 // compromise with bob changes write "waay too cool for me" + +function SuperNewAwesomeFeatureWeNeed (bool OhBoy) + We want this.... gimme gimme + \ No newline at end of file