From 2ea5ee3b26e55d632d2b803b810e1c1d00ae6f33 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Mon, 24 Jun 2013 07:25:20 +0000 Subject: [PATCH] SMACK-425 fix merge error git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13691 b35dd754-fafc-0310-a699-88a17e54d16e --- .../org/jivesoftware/smack/SmackConfiguration.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/source/org/jivesoftware/smack/SmackConfiguration.java b/source/org/jivesoftware/smack/SmackConfiguration.java index 7bf3e0f31..92f804a4c 100644 --- a/source/org/jivesoftware/smack/SmackConfiguration.java +++ b/source/org/jivesoftware/smack/SmackConfiguration.java @@ -344,17 +344,6 @@ public final class SmackConfiguration { return autoEnableEntityCaps; } -<<<<<<< HEAD -======= - /** - * Set if Entity Caps are enabled or disabled for every new connection - * - * @param true if Entity Caps should be auto enabled, false if not - */ - public static void setAutoEnableEntityCaps(boolean b) { - autoEnableEntityCaps = b; - } - /** * Set the default parsing exception callback for all newly created connections * @@ -375,7 +364,6 @@ public final class SmackConfiguration { return defaultCallback; } ->>>>>>> SMACK-425 Introduced smack.parsing.ParsingExceptionCallback, a callback invoked when a exception is thrown while parsing a stanza. Smack is now able to either rethrow the exception ulitmatly causing a disconnect *or* log/ignore the exception and resume parsing after the faulty stanza. private static void parseClassToLoad(XmlPullParser parser) throws Exception { String className = parser.nextText(); // Attempt to load the class so that the class can get initialized