From c6ec706a31f15f4d433d30406bd167345925e9a9 Mon Sep 17 00:00:00 2001
From: apvrille <ludovic.apvrille@eurecom.fr>
Date: Thu, 21 Jun 2018 13:51:42 +0200
Subject: [PATCH] update on build version: build.txt
---
build.txt | 6 +-----
src/main/java/ui/util/DefaultText.java | 6 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/build.txt b/build.txt
index 303ca79148..8ba26a8443 100644
--- a/build.txt
+++ b/build.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-12666
-=======
-12664
->>>>>>> parent of 632d5ad... update on build version: build.txt
+12667
\ No newline at end of file
diff --git a/src/main/java/ui/util/DefaultText.java b/src/main/java/ui/util/DefaultText.java
index cbfd39d64c..064f037112 100755
--- a/src/main/java/ui/util/DefaultText.java
+++ b/src/main/java/ui/util/DefaultText.java
@@ -46,12 +46,12 @@ package ui.util;
* Creation: 01/12/2003
*
* @author Ludovic APVRILLE
- * @version 1.1 29/01/2004
+ * @version 1.2 21/06/2018
*/
public class DefaultText {
- public static String BUILD = "12659";
- public static String DATE = "2018/05/09 18:25:03 CET";
+ public static String BUILD = "12666";
+ public static String DATE = "2018/06/21 13:51:42 CET";
public static StringBuffer sbAbout = makeAbout();
--
GitLab