Solve conflicts/merge upstream
This commit is contained in:
commit
586c652eab
4 changed files with 310 additions and 152 deletions
4
Makefile
4
Makefile
|
|
@ -1,5 +1,5 @@
|
|||
PREFIX ?= /usr
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
PREFIX = /usr
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
|
||||
all:
|
||||
@echo Run \'make install\' to install Neofetch.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue