From: Adam A.G. Shamblin <adam.shamblin@gmail.com>
Date: Wed, 24 Jan 2018 03:24:08 +0000 (-0700)
Subject: Merge conflicts, update from remote changes
X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=679deb73569f9daa5b6211c927abbfecadcd2657;p=dotfiles.git

Merge conflicts, update from remote changes
---

679deb73569f9daa5b6211c927abbfecadcd2657
diff --cc .gitmodules
index 693eb34,dbca2d7..d1f9b13
--- a/.gitmodules
+++ b/.gitmodules
@@@ -22,6 -19,12 +19,12 @@@
  [submodule "dotvim/bundle/typescript-vim"]
  	path = dotvim/bundle/typescript-vim
  	url = https://github.com/leafgarland/typescript-vim.git
 -[submodule "dotvim/bundle/vim-solidity"]
 -	path = dotvim/bundle/vim-solidity
 -	url = git@github.com:tomlion/vim-solidity.git
 +[submodule "dotvim/bundle/vim-javascript"]
 +	path = dotvim/bundle/vim-javascript
 +	url = git@github.com:pangloss/vim-javascript.git
+ [submodule "dotvim/bundle/ale"]
+ 	path = dotvim/bundle/ale
+ 	url = git@github.com:w0rp/ale.git
+ [submodule "dotvim/bundle/ctrlp.vim"]
+ 	path = dotvim/bundle/ctrlp.vim
+ 	url = git@github.com:ctrlpvim/ctrlp.vim.git
diff --cc dotbash_profile
index 0ed7800,0d37176..2bfb218
--- a/dotbash_profile
+++ b/dotbash_profile
@@@ -10,7 -10,7 +9,6 @@@ export TERM=xterm-256colo
  color_prompt=yes
  
  export SCRUM_DIR=~/Documents/scrum/
--export CHROME_BIN=`which chromium-browser`
  
  ##################################################
  #
@@@ -18,21 -18,21 +16,11 @@@
  #
  ##################################################
  
--#   Package install
--if [ -f /usr/local/git/contrib/completion/git-completion.bash ]; then
--    . /usr/local/git/contrib/completion/git-completion.bash
--fi
--
  #   Homebrew install
  if [ -f /usr/local/etc/bash_completion.d/git-completion.bash ]; then
      . /usr/local/etc/bash_completion.d/git-completion.bash
  fi
  
--#   RabbitMQ admin
--if [ -f /usr/local/etc/bash_completion.d/rabbitmqadmin.bash ]; then
--    . /usr/local/etc/bash_completion.d/rabbitmqadmin.bash
--fi
--
  ##################################################
  #
  #   Command Prompt Customizations
@@@ -162,6 -148,8 +154,5 @@@ complete -F _ssh_hosts ss
  #
  ##################################################
  
 -alias jsoncb="pbpaste | python -mjson.tool | gvim -"
  alias grep="grep --color=auto"
--
 -export PATH="$HOME/.cargo/bin:$PATH"
 -export PATH="~/.npm-global/bin:$PATH"
 +[[ -s "$HOME/.profile" ]] && source "$HOME/.profile"