Resolve merge conflict in comment

See gh-787
2022-03-04 15:07:43 +01:00
parent 894dac4b90
commit dae2f692a4
1 changed files with 0 additions and 4 deletions
--- 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.