[tor-commits] [tor-messenger-build/master] Remove another unnecessary patch

[arlo at torproject.org]

commit 260fd4569965ee846af13cd21ddbb5b209cc8328
Author: Arlo Breault <arlolra at gmail.com>
Date:   Tue Oct 28 20:29:34 2014 -0700

    Remove another unnecessary patch
    
     * Commented out in https://hg.mozilla.org/comm-central/rev/0ac236b0be38
---
 projects/instantbird/config             |    1 -
 projects/instantbird/purple-tests.patch |   21 ---------------------
 2 files changed, 22 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 58c4030..d9f25dc 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -47,7 +47,6 @@ input_files:
   - filename: facebook.patch
   - filename: accountcreation.patch
   - filename: prepare-messages-for-displaying.patch
-  - filename: purple-tests.patch
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
   - name: python
diff --git a/projects/instantbird/purple-tests.patch b/projects/instantbird/purple-tests.patch
deleted file mode 100644
index a0f7671..0000000
--- a/projects/instantbird/purple-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User Arlo Breault <arlolra at gmail.com>
-# Date 1414176284 25200
-#      Fri Oct 24 11:44:44 2014 -0700
-# Node ID 77ce49687f31b9634c2c32f76777a17d85e23b72
-# Parent  358de61ab92e106fe0ffd877aa71371ceae0b87f
-Remove purple testing
-
-diff --git a/im/test/xpcshell.ini b/im/test/xpcshell.ini
---- a/im/test/xpcshell.ini
-+++ b/im/test/xpcshell.ini
-@@ -1,9 +1,8 @@
- ; This Source Code Form is subject to the terms of the Mozilla Public
- ; License, v. 2.0. If a copy of the MPL was not distributed with this
- ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
- 
- [include:chat/modules/test/xpcshell.ini]
- [include:chat/components/src/test/xpcshell.ini]
- [include:chat/protocols/irc/test/xpcshell.ini]
- [include:chat/protocols/yahoo/test/xpcshell.ini]
--[include:extensions/purple/purplexpcom/src/test/xpcshell.ini]