#685 - Polishing.

Remove merge conflict messages.
2017-12-24 11:08:29 +09:00
parent 32ff7cc576
commit 13db7c7fb2
1 changed files with 0 additions and 3 deletions
--- a/src/main/java/org/springframework/hateoas/MediaTypes.java
+++ b/src/main/java/org/springframework/hateoas/MediaTypes.java
@@ -22,10 +22,7 @@ import org.springframework.http.MediaType;
 * 
 * @author Oliver Gierke
 * @author Przemek Nowak
-<<<<<<< HEAD
 * @author Drummond Dawson
-=======
->>>>>>> f5bf966... #340 - Add new Affordances API + HAL-FORMS mediatype.
 * @author Greg Turnquist
 */
 public class MediaTypes {