Commit 7fc5ae63 authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Update on build

parent abb0bf00
12360
\ No newline at end of file
<<<<<<< HEAD
12360
=======
12357
>>>>>>> parent of 23b85be... update on build version: build.txt
......@@ -51,8 +51,13 @@ package ui.util;
*/
public class DefaultText {
<<<<<<< HEAD
public static String BUILD = "12359";
public static String DATE = "2017/09/10 02:01:25 CET";
=======
public static String BUILD = "12356";
public static String DATE = "2017/09/07 02:01:14 CET";
>>>>>>> parent of 23b85be... update on build version: build.txt
public static StringBuffer sbAbout = makeAbout();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment