From ad4fcb4dbadf14afb585dece20560a284519b926 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Sun, 31 May 2015 20:43:04 -0400 Subject: [PATCH] Fix --- .../projectkorra/ProjectKorra/Ability/AbilityModuleManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java index 2640330a..9516c9b9 100644 --- a/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java +++ b/src/com/projectkorra/ProjectKorra/Ability/AbilityModuleManager.java @@ -1,4 +1,3 @@ -<<<<<<< HEAD package com.projectkorra.ProjectKorra.Ability; import java.io.File;