From: Christian Heller <c.heller@plomlompom.de>
Date: Sun, 11 Oct 2015 18:17:52 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/plomlompom/config
X-Git-Url: https://plomlompom.com/repos//%22https:/validator.w3.org/check?a=commitdiff_plain;h=9737783f88e127c687b8e6603f404cea810723cc;hp=955792fdc4bf38fbd74dbb0781cdeb08f5133cc9;p=config

Merge branch 'master' of github.com/plomlompom/config
---

diff --git a/dotfiles_user_minimal/bashrc b/dotfiles_user_minimal/bashrc
deleted file mode 100644
index 2f21e27..0000000
--- a/dotfiles_user_minimal/bashrc
+++ /dev/null
@@ -1,10 +0,0 @@
-# plomlompom's bashrc for non-login shells
-
-# Fancy colors for ls.
-alias ls="ls --color=auto"
-
-# Blue prompt with time.
-PS1="\[\e[1;34m\][\\t \\u@\\h \\w]$\[\e[m\] "
-PS2="\[\e[1;34m\]>\[\e[m\] "
-PS3="\[\e[1;34m\]>\[\e[m\] "
-PS4="\[\e[1;34m\]+\[\e[m\] "
diff --git a/dotfiles_user_server/bashrc b/dotfiles_user_server/bashrc
new file mode 100644
index 0000000..2f21e27
--- /dev/null
+++ b/dotfiles_user_server/bashrc
@@ -0,0 +1,10 @@
+# plomlompom's bashrc for non-login shells
+
+# Fancy colors for ls.
+alias ls="ls --color=auto"
+
+# Blue prompt with time.
+PS1="\[\e[1;34m\][\\t \\u@\\h \\w]$\[\e[m\] "
+PS2="\[\e[1;34m\]>\[\e[m\] "
+PS3="\[\e[1;34m\]>\[\e[m\] "
+PS4="\[\e[1;34m\]+\[\e[m\] "
diff --git a/dotfiles_user_thinkpad/bashrc b/dotfiles_user_thinkpad/bashrc
new file mode 100644
index 0000000..06df74f
--- /dev/null
+++ b/dotfiles_user_thinkpad/bashrc
@@ -0,0 +1,10 @@
+# plomlompom's bashrc for non-login shells
+
+# Fancy colors for ls.
+alias ls="ls --color=auto"
+
+# Blue prompt with time.
+PS1="\[\e[1;32m\][\\t \\u@\\h \\w]$\[\e[m\] "
+PS2="\[\e[1;32m\]>\[\e[m\] "
+PS3="\[\e[1;32m\]>\[\e[m\] "
+PS4="\[\e[1;32m\]+\[\e[m\] "