Merge upstream/master

This commit is contained in:
Daniel Carrillo 2019-06-07 17:35:30 +02:00
commit 15bfe616bc
4 changed files with 6 additions and 1 deletions

3
.gitmodules vendored
View File

@ -28,3 +28,6 @@
[submodule "modules/prompt/external/powerlevel9k"]
path = modules/prompt/external/powerlevel9k
url = https://github.com/bhilburn/powerlevel9k.git
[submodule "modules/prompt/external/powerlevel10k"]
path = modules/prompt/external/powerlevel10k
url = https://github.com/romkatv/powerlevel10k.git

@ -1 +1 @@
Subproject commit a7f0106b31c2538a36cab30428e6ca65d9a2ae60
Subproject commit 733abd4af0f23f217caa2a303fbef66382d19d6f

@ -0,0 +1 @@
Subproject commit a4b0fd6114541c688552305112a9ab9a534e8abf

View File

@ -0,0 +1 @@
../external/powerlevel10k/powerlevel10k.zsh-theme