Merge pull request #787 from JanStureNielsen

* gh-787:
  Resolve merge conflict in comment

Closes gh-787

Author: wilkinsona

Diff for: 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.