From e142f448ec08624007eb8d8e69515871b0fa34b5 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 15 Jul 2013 23:54:10 -0600
Subject: fix bad merge things

---
 settings.py | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'settings.py')

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',
-- 
cgit v1.2.3