Commits

Anonymous committed dbcb958

righ version

Comments (0)

Files changed (1)

src/nyagua/Ny.form

                       <Group type="102" attributes="0">
                           <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
                           <Component id="phKhCo2RelationPanel" min="-2" max="-2" attributes="0"/>
-<<<<<<< .mine
-                          <EmptySpace pref="53" max="32767" attributes="0"/>
-=======
                           <EmptySpace pref="47" max="32767" attributes="0"/>
->>>>>>> .r136
                           <Component id="heaterCalculatorPanel" min="-2" max="-2" attributes="0"/>
-<<<<<<< .mine
-                          <EmptySpace min="0" pref="175" max="32767" attributes="0"/>
-=======
                           <EmptySpace min="0" pref="169" max="32767" attributes="0"/>
->>>>>>> .r136
                       </Group>
                   </Group>
                 </DimensionLayout>