diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-05-20 09:44:06 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-05-20 09:44:06 +0100 |
| commit | ca9d46fea66dd3a0878fb11469156ab1c57c0fb0 (patch) | |
| tree | bbae7eed32ad4c2d1bbbd05ed127611d27dc0fb5 /TimeHACK.Main/Properties | |
| parent | 43647f873b9c2cd454b0b9389b952e1b36406725 (diff) | |
| download | histacom2-ca9d46fea66dd3a0878fb11469156ab1c57c0fb0.tar.gz histacom2-ca9d46fea66dd3a0878fb11469156ab1c57c0fb0.tar.bz2 histacom2-ca9d46fea66dd3a0878fb11469156ab1c57c0fb0.zip | |
Fixed Conflicts PART 2
Diffstat (limited to 'TimeHACK.Main/Properties')
| -rw-r--r-- | TimeHACK.Main/Properties/Resources.resx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 8eaea12..0c76722 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -350,6 +350,7 @@ </data> <data name="WinClassicGENERALApplicationToolbarBackground" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\WinClassicGENERALApplicationToolbarBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> <data name="WinClassicTaskbarItem" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> |