Author: vines
Date: Mon Feb 4 23:58:19 2013
New Revision: 1442437
URL: http://svn.apache.org/viewvc?rev=1442437&view=rev
Log:
ACCUMULO-259 - had unmerged stuff in the javadocs
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
Modified:
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
URL:
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1442437&r1=1442436&r2=1442437&view=diff
==============================================================================
---
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
(original)
+++
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
Mon Feb 4 23:58:19 2013
@@ -56,14 +56,11 @@ public class ConnectorImpl extends Conne
*
* Use {@link Instance#getConnector(String, byte[])}
*
-<<<<<<< .working
-=======
* @param instance
* @param user
* @param password
* @throws AccumuloException
* @throws AccumuloSecurityException
->>>>>>> .merge-right.r1438353
* @see Instance#getConnector(String user, byte[] password)
* @deprecated Not for client use
*/
