From e142f448ec08624007eb8d8e69515871b0fa34b5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 15 Jul 2013 23:54:10 -0600 Subject: fix bad merge things --- settings.py | 6 ------ sitestatic/Makefile | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/settings.py b/settings.py index 1fc0a496..a6be4610 100644 --- a/settings.py +++ b/settings.py @@ -177,12 +177,6 @@ BUGTRACKER_RELENG_URL = 'https://labs.parabola.nu/projects/isos' # URL for linking to projects in git PROJECTS_URL = 'https://projects.parabolagnulinux.org' -# URL for linking to the release engineering/iso project on the bugtracker -BUGTRACKER_RELENG_URL = 'https://bugs.archlinux.org/index.php?project=6' - -# URL for linking to projects in git -PROJECTS_URL = 'https://projects.archlinux.org' - # Trackers used for ISO download magnet links TORRENT_TRACKERS = ( 'udp://tracker.publicbt.com:80', diff --git a/sitestatic/Makefile b/sitestatic/Makefile index 432b15ce..d716992f 100644 --- a/sitestatic/Makefile +++ b/sitestatic/Makefile @@ -7,7 +7,7 @@ targets = \ bootstrap-typeahead \ jquery-$(jquery-ver) \ jquery.tablesorter-$(tablesorter-ver) \ - konami \ + konami target-files=$(addsuffix .js,$(targets)) $(addsuffix .min.js,$(targets)) favicon.ico silhouette.png all: $(target-files) -- cgit v1.2.3-2-g168b