From 8dab9f1c9e8f275678f405b86c79c8d73afbd744 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 25 Jun 2017 12:43:27 +0200
Subject: [PATCH] Fixed merge error

---
 .../deadlocker8/budgetmasterserver/logic/DatabaseHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java
index df7127f7e..f1e4863c8 100644
--- a/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java
+++ b/src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java
@@ -787,7 +787,7 @@ public class DatabaseHandler
 		String correctRepeatEndDate = repeatEndDate;
 		if(correctRepeatEndDate == null || correctRepeatEndDate.equals("A"))
 		{
-			correctRepeatEndDate = "NULL";
+			correctRepeatEndDate = null;
 		}
 
 		try
-- 
GitLab