diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-15 23:54:10 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-15 23:54:10 -0600 |
| commit | e142f448ec08624007eb8d8e69515871b0fa34b5 (patch) | |
| tree | dbfbbdd1ec4f783095c621cd1e2ab83bd0452f4b | |
| parent | ffff0a1c34eb8578acb7eff5e329ca666ebf96c3 (diff) | |
fix bad merge things
| -rw-r--r-- | settings.py | 6 | ||||
| -rw-r--r-- | sitestatic/Makefile | 2 |
2 files changed, 1 insertions, 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) |