null: remove silly mistake

2020-05-28 02:52:03 -04:00
parent a7eb45b3e3
commit c98361c86b
1 changed files with 0 additions and 1 deletions
--- a/runelite-api/src/main/java/net/runelite/api/Client.java
+++ b/runelite-api/src/main/java/net/runelite/api/Client.java
@@ -2005,7 +2005,6 @@ public interface Client extends GameShell
 	void setGeSearchResultIndex(int index);

 	/**
-<<<<<<< HEAD
 	 * Sets values related to jagex compliance
 	 */
 	void setComplianceValue(@Nonnull String key, boolean value);