fuck2
This commit is contained in:
1
.gitconfig
Normal file
1
.gitconfig
Normal file
@@ -0,0 +1 @@
|
||||
Makefile
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +1,2 @@
|
||||
Makefile
|
||||
**.pyc
|
||||
|
||||
8
Makefile
8
Makefile
@@ -1,7 +1,11 @@
|
||||
LN_FLAGS = -sfnv
|
||||
MKDIR_FLAGS = -pv
|
||||
|
||||
<<<<<<< HEAD
|
||||
home_symlinks = aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
|
||||
=======
|
||||
home_symlinks = vimrc vim bash_profile
|
||||
>>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
|
||||
|
||||
config_copy =
|
||||
|
||||
@@ -9,7 +13,11 @@ config_symlinks =
|
||||
|
||||
all: install
|
||||
|
||||
<<<<<<< HEAD
|
||||
install: aliases Xresources xbindkeysrc xinitrc offlineimaprc urlview msmtprc mutt zprofile zshrc vimrc vim Xmodmap
|
||||
=======
|
||||
install: vimrc vim bash_profile
|
||||
>>>>>>> be3d088b245011c8fe325ad807f90fbbcf691edb
|
||||
|
||||
.PHONY: $(home_symlinks)
|
||||
$(home_symlinks):
|
||||
|
||||
Reference in New Issue
Block a user