Make ConflictsException extend IllegalStateException

Signed-off-by: Gabriel Roldan <[email protected]>

Author: Gabriel Roldan

src/core/src/main/java/org/locationtech/geogig/porcelain/ConflictsException.java

@@ -12,7 +12,7 @@
 /**
  * Exception that indicates that an operation cannot be finished due to conflicts
  */
-public class ConflictsException extends RuntimeException {
+public class ConflictsException extends IllegalStateException{
 
     private static final long serialVersionUID = 1L;