Changeset 3ca4c3e in flex_extract.git for Run

Timestamp:

Feb 20, 2022, 3:35:27 PM (2 years ago)

Author:

Anne Tipka <anne.philipp@…>

Branches:

dev

Children:

6857073

Parents:

f0dedeb (diff), e3c679d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

solved merge conflict. merged dev from flexpart.eu with local version

File:

• Run/Control/CONTROL_EA5 (modified) (1 diff)

Run/Control/CONTROL_EA5

@@ -20 +20 @@
 PREFIX EA
 CWC 1
-RRINT 1
 ECTRANS 1