Resolving merge conflict

2016-07-21 11:11:57 -07:00 · 2016-07-21 11:11:57 -07:00 · 636a3cdb01
parent 6c9af9c65c c51fe5e882
commit 636a3cdb01
5 changed files with 4 additions and 2786 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -0,0 +1,3 @@
 [submodule "custom"]
 	path = custom
 	url = git@github.com:jimwhimpey/dotfiles.git
--- a/1
+++ b/1
@ -0,0 +1 @@
 Subproject commit 66875927a9932f3a602dfbeca73ee0be53e747ca
--- a/custom/example.bash
+++ b/custom/example.bash
@ -1,4 +0,0 @@
 #!/usr/bin/env bash
 #
 # This is an example file. Don't use this for your custom scripts. Instead, create another file within the
 # custom directory.
--- a/custom/git-completion.bash
+++ b/custom/git-completion.bash
--- a/custom/jim.bash
+++ b/custom/jim.bash
@ -1,5 +0,0 @@
 # Ennvironment variables just just for me
 export STRAVA_WRITE_AUTH_TOKEN="4b812f0e2c83bc9a823cd034507e79dada09d93a"
 # Aliases for shit
 alias commute="node ~/Sites/commute-button/index.js"
		`@ -0,0 +1 @@`
							`Subproject commit 66875927a9932f3a602dfbeca73ee0be53e747ca`