merge confilct resolved

This commit is contained in:
Andrei Stoica 2023-02-16 09:24:47 -05:00
parent d145a5e905
commit 4351e39076
3 changed files with 6 additions and 1 deletions

View File

@ -34,3 +34,6 @@ alias gctls='gcloud compute tpus list'
alias gctstart='gcloud compute tpus start' alias gctstart='gcloud compute tpus start'
alias gctstop='gcloud compute tpus stop' alias gctstop='gcloud compute tpus stop'
alias code='code-oss' alias code='code-oss'
alias tf-docker='docker run --runtime=nvidia -it --rm -p 8888:8888 -v $PWD:/tf/local andrei/dev'
alias conda-activate='source /opt/anaconda/bin/activate'
alias conda-deactivete='source /opt/anaconda/bin/deactivate'

2
.vimrc
View File

@ -30,6 +30,8 @@ call vundle#begin()
Plugin 'dylanaraps/fff.vim' Plugin 'dylanaraps/fff.vim'
Plugin 'mattn/emmet-vim'
" All of your Plugins must be added before the following line " All of your Plugins must be added before the following line
call vundle#end() " required call vundle#end() " required
filetype plugin indent on " required filetype plugin indent on " required

2
.zshrc
View File

@ -73,7 +73,7 @@ source $ZSH/oh-my-zsh.sh
# Preferred editor for local and remote sessions # Preferred editor for local and remote sessions
# if [[ -n $SSH_CONNECTION ]]; then # if [[ -n $SSH_CONNECTION ]]; then
# export EDITOR='vim' export EDITOR='vim'
# else # else
# export EDITOR='mvim' # export EDITOR='mvim'
# fi # fi