Projects information

Projects >> socialize-sdk-android >>7bac77f3de02a198fe3f18f55e76757f236d30a7

Chunk

Conflicting content
*/ public abstract class SocializeRobotiumTest extends ActivityInstrumentationTestCase2 { <<<<<<< HEAD public static final int DEFAULT_TIMEOUT_SECONDS = 30; public static final String DEFAULT_ENTITY_URL = "http://socialize.integration.tests.com?somekey=somevalue&anotherkey=anothervalue"; public static final String DEFAULT_APPLICATION_NAME = "Socialize Android Sample App"; ======= public static final int DEFAULT_TIMEOUT_SECONDS = 50; public static final String DEFAULT_ENTITY_URL = "http://socialize.integration.tests.com"; public static final String DEFAULT_APPLICATION_NAME = "Socialize Android Sample App DO NOT DELETE"; public static final String DEFAULT_GET_ENTITY = "http://entity1.com"; >>>>>>> d39318ccdc0399eb946813c2ba07f6c0b287352e protected Solo robotium; protected InputMethodManager imm = null;

Conflicting content

 */
public abstract class SocializeRobotiumTest extends ActivityInstrumentationTestCase2 {

<<<<<<< HEAD
	public static final int DEFAULT_TIMEOUT_SECONDS = 30;
	public static final String DEFAULT_ENTITY_URL = "http://socialize.integration.tests.com?somekey=somevalue&anotherkey=anothervalue";
	public static final String DEFAULT_APPLICATION_NAME = "Socialize Android Sample App";
=======
	public static final int DEFAULT_TIMEOUT_SECONDS = 50;
	public static final String DEFAULT_ENTITY_URL = "http://socialize.integration.tests.com";
	public static final String DEFAULT_APPLICATION_NAME = "Socialize Android Sample App DO NOT DELETE";
	public static final String DEFAULT_GET_ENTITY = "http://entity1.com";
>>>>>>> d39318ccdc0399eb946813c2ba07f6c0b287352e

	protected Solo robotium;
	protected InputMethodManager imm = null;

Solution content
*/ public abstract class SocializeRobotiumTest extends ActivityInstrumentationTestCase2 { public static final int DEFAULT_TIMEOUT_SECONDS = 50; public static final String DEFAULT_ENTITY_URL = "http://socialize.integration.tests.com"; public static final String DEFAULT_APPLICATION_NAME = "Socialize Android Sample App DO NOT DELETE"; public static final String DEFAULT_GET_ENTITY = "http://entity1.com"; protected Solo robotium; protected InputMethodManager imm = null;

Solution content

 */
public abstract class SocializeRobotiumTest extends ActivityInstrumentationTestCase2 {

	public static final int DEFAULT_TIMEOUT_SECONDS = 50;
	public static final String DEFAULT_ENTITY_URL = "http://socialize.integration.tests.com";
	public static final String DEFAULT_APPLICATION_NAME = "Socialize Android Sample App DO NOT DELETE";
	public static final String DEFAULT_GET_ENTITY = "http://entity1.com";

	protected Solo robotium;
	protected InputMethodManager imm = null;

File
SocializeRobotiumTest.java

Developer's decision
Version 2

Kind of conflict
Attribute