master
Paul Walko 2017-11-15 21:41:22 -05:00
commit 2d2deeecbd
3 changed files with 10 additions and 0 deletions

1
.gitconfig Normal file
View File

@ -0,0 +1 @@
Makefile

1
.gitignore vendored
View File

@ -1 +1,2 @@
Makefile
**.pyc **.pyc

View File

@ -1,7 +1,11 @@
LN_FLAGS = -sfnv LN_FLAGS = -sfnv
MKDIR_FLAGS = -pv MKDIR_FLAGS = -pv
<<<<<<< HEAD
home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
=======
home_symlinks = vimrc vim bash_profile
>>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
config_copy = config_copy =
@ -9,7 +13,11 @@ config_symlinks =
all: install all: install
<<<<<<< HEAD
install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
=======
install: vimrc vim bash_profile
>>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
.PHONY: $(home_symlinks) .PHONY: $(home_symlinks)
$(home_symlinks): $(home_symlinks):