From 998245be26b3c84cd76d803e4c8cd07448e73af7 Mon Sep 17 00:00:00 2001
From: rcollier <rcollier@b35dd754-fafc-0310-a699-88a17e54d16e>
Date: Sat, 23 Mar 2013 22:23:19 +0000
Subject: [PATCH] SMACK-412 Fixed merge error.

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/branches/smack_3_3_0@13591 b35dd754-fafc-0310-a699-88a17e54d16e
---
 build/resources/META-INF/smack-config.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/resources/META-INF/smack-config.xml b/build/resources/META-INF/smack-config.xml
index 7009ab468..52421c703 100644
--- a/build/resources/META-INF/smack-config.xml
+++ b/build/resources/META-INF/smack-config.xml
@@ -33,6 +33,7 @@
         <className>org.jivesoftware.smackx.LastActivityManager</className>
         <className>org.jivesoftware.smack.ReconnectionManager</className>    
         <className>org.jivesoftware.smackx.commands.AdHocCommandManager</className>    
+        <className>org.jivesoftware.smack.util.dns.JavaxResolver</className>
     </startupClasses>