Commit 4a677614 authored by Ludovic Apvrille's avatar Ludovic Apvrille
Browse files

Update on error in git

parent 8338b035
......@@ -120,7 +120,7 @@ import ui.tmlcompd.*;
import ui.tmlcp.TMLCPPanel;
import ui.tmldd.*;
import ui.tmlsd.TMLSDPanel;
import ui.het.*;
//import ui.het.*;
import ui.tree.GraphTree;
import ui.tree.InvariantDataTree;
import ui.tree.SearchTree;
......
......@@ -85,7 +85,7 @@ import ui.tmlcp.TMLCPPanel;
import ui.tmldd.TMLArchiDiagramPanel;
import ui.tmldd.TMLArchiCAMSNode;
import ui.tmlsd.TMLSDPanel;
import ui.het.*;
//import ui.het.*;
import ui.tree.DiagramTreeModel;
import ui.tree.DiagramTreeRenderer;
import ui.tree.JDiagramTree;
......
......@@ -62,7 +62,7 @@ import ui.tmlcd.TMLTaskOperator;
import ui.tmlcompd.TMLCCompositeComponent;
import ui.tmlcompd.TMLCPrimitiveComponent;
import ui.tmlcompd.TMLCRecordComponent;
import ui.het.*;
//import ui.het.*;
import ui.window.JDialogCode;
import ui.window.JDialogNote;
import ui.window.JDialogSearchBox;
......
......@@ -47,7 +47,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import tmltranslator.HwCPU;
import ui.*;
import ui.het.*;
//import ui.het.*;
import ui.util.IconManager;
import javax.swing.*;
......
......@@ -51,14 +51,8 @@ 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