Mergekonflike ausbessern;
This commit is contained in:
@@ -250,9 +250,6 @@
|
||||
<data name="rhenus" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\rhenus.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="arrow_left_a" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\arrow-left-a.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
@@ -700,4 +697,13 @@
|
||||
<data name="asdadasda5sd" xml:space="preserve">
|
||||
<value />
|
||||
</data>
|
||||
<data name="Declarant" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Declarant.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="statusBtn_vorbereitet_InAktiv" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\statusBtn_vorbereitet_InAktiv.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
<data name="Transcode" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
||||
<value>..\Resources\Transcode.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||
</data>
|
||||
</root>
|
||||
Reference in New Issue
Block a user