xml,txt files

wmo-im · Jul 10, 2024 · ece245c · ece245c
1 parent b461aa4
commit ece245c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/xml/CodeFlag.xml b/xml/CodeFlag.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" ?>
+<<<<<<< HEAD
 <dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+=======
+<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-07-02T12:27:57.425998">
+>>>>>>> fbbb97e (xml,txt files)
 	<GRIB2_CodeFlag_en>
 		<Title_en>Code table 0.0 - Discipline of processed data in the GRIB message, number of GRIB Master table</Title_en>
 		<CodeFlag>0</CodeFlag>

diff --git a/xml/Template.xml b/xml/Template.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" ?>
+<<<<<<< HEAD
 <dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+=======
+<dataroot xmlns:od="urn:schemas-microsoft-com:officedata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" generated="2024-07-02T12:27:57.425998">
+>>>>>>> fbbb97e (xml,txt files)
 	<GRIB2_Template_en>
 		<Title_en>Identification template 1.0 - calendar definition</Title_en>
 		<OctetNo>24</OctetNo>