Skip to content

GitLab

Dear all, Please be informed that, due to an important technical maintenance, the Gitlab server (git.list.lu) will not be available on Thursday April 22nd, from 9 A.M. to 1 P.M. (Luxembourg Time Zone). Thank you for your understanding.

Commit 17d399cf authored by Nico Mack's avatar Nico Mack
Browse files
Options

Merge branch 'dev-nico' of git@git.list.lu:nui/TULIP-CPS.git into 

dev-nico

Conflicts:
	CPS/src/lu/list/itis/dkd/tui/marker/builder/BaseInfoMarkerBuilder.java
parents b03432de 50212979
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
CPS/src/lu/list/itis/dkd/tui/marker/builder/BaseInfoMarkerBuilder.java
View file @ 17d399cf
...@@ -92,6 +92,8 @@ public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>> ...@@ -92,6 +92,8 @@ public abstract class BaseInfoMarkerBuilder<B extends BaseInfoMarkerBuilder<B>>
} }
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// *************************************************************************** // ***************************************************************************
// * Class Body * // * Class Body *
......
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

Luxembourg Institute of Science and Technology - www.list.lu.