mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-13 03:12:21 +01:00
mergefoo
This commit is contained in:
parent
43e1610e82
commit
6c0f1e1449
1 changed files with 0 additions and 4 deletions
|
|
@ -204,7 +204,3 @@ PROMPT='%{%f%b%k%}$(build_prompt) '
|
||||||
RPROMPT='%{%f%r%k%}$(build_rprompt) '
|
RPROMPT='%{%f%r%k%}$(build_rprompt) '
|
||||||
|
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> 0166395a0ca78d2d253a3f38272d6542bdf2efda
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue