Merge remote-tracking branch 'origin/Alex' into Alex

# Conflicts: # ChessLearnProgram/.vs/ChessLearnProgram/v17/.suo # ChessLearnProgram/Chess/Chess.csproj # ChessLearnProgram/Chess/Properties/Resources.Designer.cs # ChessLearnProgram/Chess/obj/Debug/Chess.Properties.Resources.resources # ChessLearnProgram/Chess/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
TeamHSE · Jun 6, 2022 · 2de8701 · 2de8701
2 parents 66f3812 + fb5be8f
commit 2de8701
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 2 deletions.
diff --git a/...Program/.vs/ChessLearnProgram/FileContentIndex/1005d713-3244-42ff-bf25-173acef2ef88.vsidx b/...Program/.vs/ChessLearnProgram/FileContentIndex/1005d713-3244-42ff-bf25-173acef2ef88.vsidx
diff --git a/...Program/.vs/ChessLearnProgram/FileContentIndex/37da1248-c89e-49cc-8b89-bf796f1e4132.vsidx b/...Program/.vs/ChessLearnProgram/FileContentIndex/37da1248-c89e-49cc-8b89-bf796f1e4132.vsidx
diff --git a/...Program/.vs/ChessLearnProgram/FileContentIndex/3a1a0928-e831-44c0-b2df-73c2f8672130.vsidx b/...Program/.vs/ChessLearnProgram/FileContentIndex/3a1a0928-e831-44c0-b2df-73c2f8672130.vsidx
diff --git a/...Program/.vs/ChessLearnProgram/FileContentIndex/6d2a97d4-8e27-49e7-9ce9-ebdcc6b059e6.vsidx b/...Program/.vs/ChessLearnProgram/FileContentIndex/6d2a97d4-8e27-49e7-9ce9-ebdcc6b059e6.vsidx
diff --git a/...Program/.vs/ChessLearnProgram/FileContentIndex/9807c583-3e53-4393-8a28-5e404bead6fc.vsidx b/...Program/.vs/ChessLearnProgram/FileContentIndex/9807c583-3e53-4393-8a28-5e404bead6fc.vsidx
diff --git a/ChessLearnProgram/Chess/Properties/Resources.resx b/ChessLearnProgram/Chess/Properties/Resources.resx
@@ -121,8 +121,8 @@
     <value />
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Иконка_ворона" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Иконка-ворона.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Knight__1_" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Knight (1).ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Фон_для_кнопки" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Фон для кнопки.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

diff --git a/ChessLearnProgram/Chess/Resources/Knight (1).ico b/ChessLearnProgram/Chess/Resources/Knight (1).ico
diff --git a/ChessLearnProgram/Chess/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/ChessLearnProgram/Chess/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll
diff --git a/ChessLearnProgram/ChessLearnProgram/obj/Debug/TempPE/Resource.Designer.cs.dll b/ChessLearnProgram/ChessLearnProgram/obj/Debug/TempPE/Resource.Designer.cs.dll