From a8b0b9230907d747980fb41eee7283ed5394fc09 Mon Sep 17 00:00:00 2001
From: Ludovic Apvrille <ludovic.apvrille@telecom-paristech.fr>
Date: Tue, 15 May 2018 14:19:56 +0200
Subject: [PATCH] Reworking on default
---
src/main/java/ui/util/DefaultText.java | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index ae86ad1145..ded10fb5cd 100644
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -50,13 +50,8 @@ package ui.util;
*/
public class DefaultText {
-<<<<<<< HEAD
- public static String BUILD = "12665";
- public static String DATE = "2018/05/15 02:01:37 CET";
-=======
public static String BUILD = "12663";
public static String DATE = "2018/05/13 02:01:46 CET";
->>>>>>> parent of 632d5ad... update on build version: build.txt
public static StringBuffer sbAbout = makeAbout();
--
GitLab