Commit graph

7 commits

Author SHA1 Message Date
Howland Owl
a92c39c710 Revert "Merge branch 'home' into 'fixthatshit'"
This reverts commit 1639a576f4, reversing
changes made to cc75e76c65.
2016-12-09 21:22:01 +02:00
Howland Owl
2434c12586 Revert "Revert "shell bits that needed to be fixed.""
This reverts commit 6951b01f08.
2016-12-09 21:19:24 +02:00
Howland Owl
6951b01f08 Revert "shell bits that needed to be fixed."
This reverts commit cc75e76c65.
2016-12-09 21:19:05 +02:00
Howland Owl
1639a576f4 Merge branch 'home' into 'fixthatshit'
# Conflicts:
#   powerline-shell-init
#   zshrc
2016-12-09 21:06:18 +02:00
Howland Owl
cc75e76c65 shell bits that needed to be fixed. 2016-12-09 21:01:33 +02:00
Howland Owl
512c3ac67c updates to the prompt 2016-12-09 20:12:01 +02:00
Howland Owl
c1582d93fd some nerd font variations 2016-12-09 19:08:15 +02:00