Projects information

Chunk

Conflicting content
private static int MAX_RECORD_PER_PAGE = 20; private static Logger logger = Logger.getLogger(UserMgrImpl.class); <<<<<<< HEAD ======= >>>>>>> 40ee3b7d12b6b277fdb26f0052c8843cf08a1d39 private static String SELECT_FROM_USERS_RANKING = "select " + "id, " + "userName, " + "longName, " + "lastLogin, " + "firstLogin, " + "users.cash as cash, " + "lastIp, " + "oauthToken, "

Conflicting content

	private static int MAX_RECORD_PER_PAGE = 20;
	private static Logger logger = Logger.getLogger(UserMgrImpl.class);

<<<<<<< HEAD
=======
	
>>>>>>> 40ee3b7d12b6b277fdb26f0052c8843cf08a1d39
	private static String SELECT_FROM_USERS_RANKING = "select " + "id, "
			+ "userName, " + "longName, " + "lastLogin, " + "firstLogin, "
			+ "users.cash as cash, " + "lastIp, " + "oauthToken, "

Solution content
private static int MAX_RECORD_PER_PAGE = 20; private static Logger logger = Logger.getLogger(UserMgrImpl.class); private static String SELECT_FROM_USERS_RANKING = "select " + "id, " + "userName, " + "longName, " + "lastLogin, " + "firstLogin, " + "users.cash as cash, " + "lastIp, " + "oauthToken, "

Solution content

	private static int MAX_RECORD_PER_PAGE = 20;
	private static Logger logger = Logger.getLogger(UserMgrImpl.class);
	private static String SELECT_FROM_USERS_RANKING = "select " + "id, "
			+ "userName, " + "longName, " + "lastLogin, " + "firstLogin, "
			+ "users.cash as cash, " + "lastIp, " + "oauthToken, "

File
UserMgrImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Projects >> twitstreet >>210f02d5671fd687212e443651b6a70815c76ffc