Skip to content
Snippets Groups Projects
Commit 8dab9f1c authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed merge error

parent 344b7f54
No related branches found
No related tags found
1 merge request!142merge v1_3_0 into master
Show whitespace changes
Inline Side-by-side
src/de/deadlocker8/budgetmasterserver/logic/DatabaseHandler.java
+ 1
− 1
View file @ 8dab9f1c
...@@ -787,7 +787,7 @@ public class DatabaseHandler ...@@ -787,7 +787,7 @@ public class DatabaseHandler
String correctRepeatEndDate = repeatEndDate; String correctRepeatEndDate = repeatEndDate;
if(correctRepeatEndDate == null || correctRepeatEndDate.equals("A")) if(correctRepeatEndDate == null || correctRepeatEndDate.equals("A"))
{ {
correctRepeatEndDate = "NULL"; correctRepeatEndDate = null;
} }
try try
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment