From cf8978b86d0a10494334789f70d1e348c60e63f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 8 Sep 2014 11:40:56 +0200
Subject: [PATCH] Revert "Fix test"

This reverts commit f392d95ac34361ac9b38f9f39baf57500717e665.
---
 .../keychain/pgp/UncachedKeyringMergeTest.java                  | 2 +-
 settings.gradle                                                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
index 96d56cb77..64152a040 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java
@@ -281,7 +281,7 @@ public class UncachedKeyringMergeTest {
                     ringB.getEncoded(), false, 0).getSecretKey();
             secretKey.unlock("");
             // sign all user ids
-            modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds(), null, null);
+            modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds());
         }
 
         {
diff --git a/settings.gradle b/settings.gradle
index 997dcc838..038e9da23 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,4 +15,3 @@ include ':extern:KeybaseLib:Lib'
 include ':extern:TokenAutoComplete:library'
 include ':extern:openpgp-card-nfc-lib:library'
 include ':extern:safeslinger-exchange'
-include ':OpenKeychain-Test'