Revert "Revert "ssh -q""

This reverts commit 19dab41.
kylehotchkiss · Mar 24, 2012 · 7b329fc · 7b329fc
1 parent 19dab41
commit 7b329fc
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/terminal/bash_profile b/terminal/bash_profile
@@ -15,9 +15,21 @@ if [ "$TERM" != "dumb" ]; then
  fi
 fi
 
+<<<<<<< HEAD
 # ------------------ #
 # Output Corrections #
 # ------------------ #
 LC_COLLATE=C; export LC_COLLATE
 
 alias ls='ls --color'
+=======
+# ---------------- #
+# Coreutils in OSX #
+# ---------------- #
+#PATH="/usr/local/bin:$PATH"
+
+
+# Alias
+alias ls='ls -hF --color --hide="*.pyc"'
+alias ssh='ssh -q' 
+>>>>>>> ssh -q