Projects >> spring-data-graph-examples >>c3d7cdf32445b9f1b398e32ae864760107251e21

Chunk
Conflicting content
		List listRecs = new ArrayList();
		for (Recommendation recommendation : recs) {
			RecommendationFormBean rfb = new RecommendationFormBean();
<<<<<<< HEAD
			rfb.setComments(recommendation.getComment());	
			rfb.setName(recommendation.getRestaurant().getName());
=======
			rfb.setComments(recommendation.getComment());
            rfb.setName(recommendation.getRestaurant().getName());
			//N.B. until a bug if fixed, this will be null.
			//rfb.setName(recommendation.getRestaurant().getName());
>>>>>>> 19d0d52b79c5103527e297747571283f1506515f
			rfb.setRating(recommendation.getStars());		
			rfb.setId(recommendation.getId());
			listRecs.add(rfb);
Solution content
		List listRecs = new ArrayList();
		for (Recommendation recommendation : recs) {
			RecommendationFormBean rfb = new RecommendationFormBean();
			rfb.setComments(recommendation.getComment());	
			rfb.setName(recommendation.getRestaurant().getName());
			rfb.setRating(recommendation.getStars());		
			rfb.setId(recommendation.getId());
			listRecs.add(rfb);
File
RecommendationController.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation