diff options
author | C. Bess <cbess@cfaulks-air.pk5001z> | 2014-09-02 18:52:04 -0500 |
---|---|---|
committer | C. Bess <cbess@cfaulks-air.pk5001z> | 2014-09-02 18:52:04 -0500 |
commit | 313c0daf05ccb5624ae5009565eb01c5ddeaa022 (patch) | |
tree | 5f40a62e42e3a00fbe255328558dfcca7c3dd989 /bash.html.markdown | |
parent | b50d4443cdca87e3342e2364c9e6afd2d7fce7d2 (diff) | |
parent | 0b3f3e01e245ab2f73226fe4ba09d567ca76aa98 (diff) |
- fix merge swift conflict
- Merge master
Diffstat (limited to 'bash.html.markdown')
-rw-r--r-- | bash.html.markdown | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bash.html.markdown b/bash.html.markdown index 061d35b0..57fb5c55 100644 --- a/bash.html.markdown +++ b/bash.html.markdown @@ -73,9 +73,9 @@ echo Hello, $NAME! # use 'man test' for more info about conditionals if [ $NAME -ne $USER ] then - echo "Your name is your username" -else echo "Your name isn't your username" +else + echo "Your name is your username" fi # There is also conditional execution |