Merge branch 'master' of github.com:Jab2870/dotfiles

8 years ago · a6f3ebfa27
parent 0cf70ed51d 6bb80f8042
commit a6f3ebfa27
2 changed files with 7 additions and 1 deletions
--- a/config/vim
+++ b/config/vim
@ -1 +1 @@
-Subproject commit 9efe5ee13e1ab31f1996a5f60f95525679937fd6
+Subproject commit 8240d421bd91de1f1fc0583f77010e37c758127a
--- a/6
+++ b/6
@ -1,2 +1,8 @@
 *~
 # This is for vim swap files
 *.sw*
 #Web stuff
 /wp-config.php
 /.htaccess
 /wp-content/uploads/
		`@ -1 +1 @@`
			`Subproject commit 9efe5ee13e1ab31f1996a5f60f95525679937fd6`				`Subproject commit 8240d421bd91de1f1fc0583f77010e37c758127a`