Mergekonflike ausbessern;

This commit is contained in:
2025-05-12 10:15:34 +02:00
parent 74817bffa8
commit f732845f15
16 changed files with 5377 additions and 2712 deletions

View File

@@ -488,6 +488,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Public ReadOnly Property Declarant() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Declarant", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
@@ -1648,6 +1658,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
Public ReadOnly Property Transcode() As System.Drawing.Bitmap
Get
Dim obj As Object = ResourceManager.GetObject("Transcode", resourceCulture)
Return CType(obj,System.Drawing.Bitmap)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
'''</summary>

View File

@@ -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>