revert error

kzwkt · Aug 12, 2017 · d9c7747 · d9c7747
1 parent db713f1
commit d9c7747
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.zshrc b/.zshrc
@@ -28,7 +28,7 @@ export VISUAL=/usr/bin/vim
 _JOJO_ZSH_HOME=/home/budiman
 
 # Modify this to the themes you want to use inside the /themes folder, the theme name without the .zsh, default is jojo theme
-_JOJO_ZSH_THEME="simpleasy"
+_JOJO_ZSH_THEME=""
 
 # Source JoJo ZSH Prompt Themes
 if [[ -s "${_JOJO_ZSH_HOME}/.jojo-zsh-prompt/base.zsh" ]]; then

diff --git a/my-zsh/alias.zsh b/my-zsh/alias.zsh
@@ -407,9 +407,6 @@ alias cpr='cp -R'
 alias rmr='rm -R'
 # Convertions
 alias cwtp='find ./ -name "*.webp" -exec dwebp {} -o {}.png \; && rm -R *.webp' # convert webp to png
-<<<<<<< HEAD
-alias cptj='mogrify -flatten -format jpg *.png && rm -R *.png'
-=======
+alias cptj='mogrify -flatten -format jpg *.png && rm -R *.png' # convert png to jpg
 alias cjtp='find ./ -name "*.jpg" -exec convert {} {}.png \; && rm -R *.jpg' # convert jpg to png
->>>>>>> 62a4604f3d01c5c0840a40dfd4c1b9172cbb3851
 # }}}