From dae2f692a4d89b3bd19461b10e68b827e56bd798 Mon Sep 17 00:00:00 2001
From: Jan Nielsen <jan.sture.nielsen@gmail.com>
Date: Fri, 4 Mar 2022 15:07:43 +0100
Subject: [PATCH] Resolve merge conflict in comment

See gh-787
---
 .../src/test/java/com/example/notes/ApiDocumentation.java     | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java b/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java
index 29addc86..64c880f2 100644
--- a/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java
+++ b/samples/rest-notes-spring-data-rest/src/test/java/com/example/notes/ApiDocumentation.java
@@ -1,9 +1,5 @@
 /*
-<<<<<<< HEAD
- * Copyright 2014-2021 the original author or authors.
-=======
  * Copyright 2014-2022 the original author or authors.
->>>>>>> 2.0.x
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.