869 checkstyle fixes

yegor256 · Jul 22, 2022 · fd9ea3a · fd9ea3a
1 parent fb8392a
commit fd9ea3a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/main/java/com/yegor256/tojos/CachedTojos.java b/src/main/java/com/yegor256/tojos/CachedTojos.java
@@ -31,11 +31,8 @@
 /**
  * The wrapper which caches underlying tojos.
  * Modify operation clears the cache.
-<<<<<<< HEAD
- * @since 1.0
-=======
  * This class is NOT thread-safe.
->>>>>>> 092c3da1070fedf4870d6b4b750bc1ab4752427c
+ * @since 1.0
  */
 public final class CachedTojos implements Tojos {