azkaban-uncached

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..849ddff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+dist/

diff --git a/src/java/azkaban/database/AbstractJdbcLoader.java b/src/java/azkaban/database/AbstractJdbcLoader.java
index c1c92b8..faac467 100644
--- a/src/java/azkaban/database/AbstractJdbcLoader.java
+++ b/src/java/azkaban/database/AbstractJdbcLoader.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2012 LinkedIn Corp.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
 package azkaban.database;
 
 import java.io.IOException;
@@ -113,4 +129,4 @@ public abstract class AbstractJdbcLoader {
 			return results;
 		}
 	}
-}
\ No newline at end of file
+}

diff --git a/src/java/azkaban/scheduler/Schedule.java b/src/java/azkaban/scheduler/Schedule.java
index 2ec1ba3..32eb916 100644
--- a/src/java/azkaban/scheduler/Schedule.java
+++ b/src/java/azkaban/scheduler/Schedule.java
@@ -395,7 +395,6 @@ public class Schedule{
 		
 		
 	}
-<<<<<<< HEAD
 
 	public boolean isRecurring() {
 		return period == null ? false : true;
@@ -406,6 +405,3 @@ public class Schedule{
 	}
 	
 }
-=======
-}
->>>>>>> bb34b0f2587431129a808ff7742dfadbbe6817d5

diff --git a/src/java/azkaban/scheduler/ScheduleLoader.java b/src/java/azkaban/scheduler/ScheduleLoader.java
index ceacbc5..e834cea 100644
--- a/src/java/azkaban/scheduler/ScheduleLoader.java
+++ b/src/java/azkaban/scheduler/ScheduleLoader.java
@@ -29,12 +29,6 @@ public interface ScheduleLoader {
 	public void removeSchedule(Schedule s) throws ScheduleManagerException;
 
 	public void updateNextExecTime(Schedule s) throws ScheduleManagerException;
-<<<<<<< HEAD
-	
-	// only use when using external runner
-	public List<Schedule> loadUpdatedSchedules() throws ScheduleManagerException;
-}
-=======
 
+	public List<Schedule> loadUpdatedSchedules() throws ScheduleManagerException;
 }
->>>>>>> bb34b0f2587431129a808ff7742dfadbbe6817d5

diff --git a/src/java/azkaban/utils/Utils.java b/src/java/azkaban/utils/Utils.java
index 8e8de29..17a3edf 100644
--- a/src/java/azkaban/utils/Utils.java
+++ b/src/java/azkaban/utils/Utils.java
@@ -309,7 +309,6 @@ public class Utils {
 		Method method = clazz.getDeclaredMethod(methodName, argTypes);
 		return method.invoke(null, args);
 	}
-<<<<<<< HEAD
 	
 	public static void copyStream(InputStream input, OutputStream output) throws IOException {
 		byte[] buffer = new byte[1024];
@@ -385,6 +384,3 @@ public class Utils {
 		return periodStr;
 	}
 }
-=======
-}
->>>>>>> bb34b0f2587431129a808ff7742dfadbbe6817d5

diff --git a/src/java/azkaban/webapp/AzkabanServer.java b/src/java/azkaban/webapp/AzkabanServer.java
index d91b8b2..edb7d19 100644
--- a/src/java/azkaban/webapp/AzkabanServer.java
+++ b/src/java/azkaban/webapp/AzkabanServer.java
@@ -135,9 +135,5 @@ public abstract class AzkabanServer {
 	public abstract VelocityEngine getVelocityEngine();
 	
 	public abstract UserManager getUserManager();
-<<<<<<< HEAD
 	
 }
-=======
-}
->>>>>>> bb34b0f2587431129a808ff7742dfadbbe6817d5