Skip to content

Commit

Permalink
Resolved conflicts.
Browse files Browse the repository at this point in the history
  • Loading branch information
larswik committed Jul 6, 2024
1 parent c20471e commit 2c4da6e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="DryBulkDensity_2Zdlo7FL9eP39_zTeDrR" Name="DryBulkDensity" UniqueId="a39ffbf2-1cf5-49a1-90c9-fbd768375fdb" PrimaryDataType="IfcMassDensityMeasure" />
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="DryBulkDensity_2Zd$lo7FL9eP39_zTeDr$R" Name="DryBulkDensity" UniqueId="a39ffbf2-1cf5-49a1-90c9-fbd768375fdb" PrimaryDataType="IfcMassDensityMeasure" />

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="PwaveVelocity_3PNsA2fgH81Aaey7kSTDO" Name="PwaveVelocity" UniqueId="d95f6282-a6a4-4804-a928-f07b9cfdd358" PrimaryDataType="IfcLinearVelocityValue" />
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="PwaveVelocity_3PNsA2fgH81Aaey7kS$TDO" Name="PwaveVelocity" UniqueId="d95f6282-a6a4-4804-a928-f07b9cfdd358" PrimaryDataType="IfcLinearVelocityValue" />

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Resistance_1HgnC0Qav6qxJDXOhpgisE" Name="Resistance" UniqueId="51ab1300-6a4e-46d3-b4cd-858af3aacd8e" PrimaryDataType="IfcElectricResistanceMeasure" />
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Resistance" UniqueId="51ab1300-6a4e-46d3-b4cd-858af3aacd8e" PrimaryDataType="IfcElectricResistanceMeasure" />

Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<DocProperty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Resistivity_0CD1$azajCjeK721qDipOz" Name="Resistivity" UniqueId="0c341fe4-f64b-4cb6-8507-081d0db3363d" PrimaryDataType="IfcElectricalResistivityMeasure" />

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<DocPropertySet xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="Pset_GeoSciencePropertiesCommon" UniqueId="a3ad9c70-0ceb-4e74-b7cf-479e0cbfa6f7" ApplicableType="IfcGeoScienceFeature/GEOLOGICALUNIT,IfcGeoScienceFeature/GEOTECHNICALUNIT" PropertySetType="PSET_OCCURRENCEDRIVEN">
<Properties>
<DocProperty xsi:nil="true" href="PwaveVelocity_3PNsA2fgH81Aaey7kSTDO" />
<DocProperty xsi:nil="true" href="PwaveVelocity_3PNsA2fgH81Aaey7kS$TDO" />
<DocProperty xsi:nil="true" href="SwaveVelocity_1LvJ8TerD4XunolAqoyu8J" />
<DocProperty xsi:nil="true" href="Resistivity_0CD1azajCjeK721qDipOz" />
<DocProperty xsi:nil="true" href="Resistivity_0CD1$azajCjeK721qDipOz" />
<DocProperty xsi:nil="true" href="WetBulkDensity_0zymFCuR5CTx4wkxmFWmPt" />
<DocProperty xsi:nil="true" href="GroundwaterTemperature_3IMyTWYAj0SuSW8M3JUwRd" />
<DocProperty xsi:nil="true" href="DryBulkDensity_2Zdlo7FL9eP39_zTeDrR" />
<DocProperty xsi:nil="true" href="DryBulkDensity_2Zd$lo7FL9eP39_zTeDr$R" />
</Properties>
</DocPropertySet>

0 comments on commit 2c4da6e

Please sign in to comment.