diff --git a/build.txt b/build.txt
index 303ca791481ebc8faf0b9c0f6347c50e28045a8a..8ba26a844336001ab20c8638bce1498cea5ac773 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 cbfd39d64cbea8b5ee681cab7cf7ef5baf1948ae..064f037112deb70a52d463320fb21f7a04c6512d 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();