repo: uritools
action: commit
revision: 
path_from: 
revision_from: 33c881b546d40fe88ee0a8988c654d2563d38582:
path_to: 
revision_to:
git.thebackupbox.net
uritools
git clone git://git.thebackupbox.net/uritools
commit 33c881b546d40fe88ee0a8988c654d2563d38582
Merge: 4f9509b 07f78f9
Author: epoch 
Date:   Sun Nov 15 19:12:05 2020 -0600

    merge conflict resolved

diff --cc Makefile
index 1f3ccd2c6e759cdd6f9345df1a31b53ddd3f7877,39106252a45d9c6b7b576d17d2f34c50a84963b8..1a347cacbc85ebaf93a956cf7ac34992f4b6d6fd
--- a/Makefile
+++ b/Makefile
@@@ -37,5 -40,6 +40,8 @@@ install: al
  	install -t $(PREFIX)/bin copy_start_nevermind.sh
  	install -t $(PREFIX)/bin choose
  	install -t $(PREFIX)/bin query_param
 +	install -t $(PREFIX)/bin data_handler
 +	install -t $(PREFIX)/bin unshorten.sh
+ 	install -t $(PREFIX)/bin shorten
+ 	chgrp shorten $(PREFIX)/bin/shorten
+ 	chmod g+s $(PREFIX)/bin/shorten

-----END OF PAGE-----