From a2c1ac643224f0f763fa99c25de88c469496514d Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Wed, 23 Mar 2016 04:27:40 +0000
Subject: [PATCH] Merged requirements for update script

---
 requirements.txt                   | 2 +-
 thirdparty/Mumble/requirements.txt | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 thirdparty/Mumble/requirements.txt

diff --git a/requirements.txt b/requirements.txt
index b6bf0a46..71b65d17 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ evelink
 dnspython
 passlib
 requests>=2.9.1
-#requests_cache
+zeroc-ice
 
 # Django Stuff #
 django==1.6.5
diff --git a/thirdparty/Mumble/requirements.txt b/thirdparty/Mumble/requirements.txt
deleted file mode 100644
index 20d69207..00000000
--- a/thirdparty/Mumble/requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-zeroc-ice
-mysql-python