Merge remote-tracking branch 'origin/master'

Conflicts: src/main/java/lol4j/protocol/resource/impl/AbstractResourceImpl.java
aaryn101 · Dec 13, 2013 · f45971b · f45971b
2 parents 6d41923 + 3717f09
commit f45971b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/lol4j/protocol/resource/impl/AbstractResourceImpl.java b/src/main/java/lol4j/protocol/resource/impl/AbstractResourceImpl.java
@@ -9,7 +9,7 @@
 /**
  * Created by Aaryn101 on 12/11/13.
  */
-public class AbstractResourceImpl {
+public abstract class AbstractResourceImpl {
     private List<Region> supportedRegions = new ArrayList<>();
     private ApiRequestManager apiRequestManager;
     private String baseUri;