Projects >> andlytics >>8efd69fef801445b3fc611ea20ac8867af84fe47

Chunk
Conflicting content
	}

<<<<<<< HEAD
	// TODO Check if we ever care about the time of day
	public static String formatDate(Date date) {
		SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
=======
	public String formatDate(Date date) {
>>>>>>> c604abaedd76069e82aebca1888ccc10300cfbaa
		return dateFormat.format(date);
	}
Solution content
	}

	public String formatDate(Date date) {
		return dateFormat.format(date);
	}
File
ContentAdapter.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Variable