diff --git a/compabetov2.csproj b/compabetov2.csproj
index 5012fbb..5df4992 100644
--- a/compabetov2.csproj
+++ b/compabetov2.csproj
@@ -15,6 +15,22 @@
true
+ false
+ C:\Users\Googl\Desktop\
+ true
+ Disk
+ false
+ Foreground
+ 7
+ Days
+ false
+ false
+ true
+ 0
+ 1.0.0.%2a
+ false
+ true
+ true
AnyCPU
@@ -35,6 +51,21 @@
prompt
4
+
+ icono.ico
+
+
+ true
+
+
+ 67F33B38C8AA9F19D3F85F49983D54F176F6353C
+
+
+ compabetov2_TemporaryKey.pfx
+
+
+ true
+
packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll
@@ -146,6 +177,7 @@
vender.cs
+
SettingsSingleFileGenerator
@@ -241,6 +273,21 @@
+
+
+
+
+
+ False
+ Microsoft .NET Framework 4.7.2 %28x86 y x64%29
+ true
+
+
+ False
+ .NET Framework 3.5 SP1
+ false
+
+
diff --git a/compabetov2_TemporaryKey.pfx b/compabetov2_TemporaryKey.pfx
new file mode 100644
index 0000000..4ab2ece
Binary files /dev/null and b/compabetov2_TemporaryKey.pfx differ
diff --git a/icono.ico b/icono.ico
new file mode 100644
index 0000000..6b649c4
Binary files /dev/null and b/icono.ico differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache
index 10a1a65..b27a436 100644
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index b71689b..da7b35a 100644
Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/obj/Debug/compabetov2.csproj.AssemblyReference.cache b/obj/Debug/compabetov2.csproj.AssemblyReference.cache
index 314837d..1367df0 100644
Binary files a/obj/Debug/compabetov2.csproj.AssemblyReference.cache and b/obj/Debug/compabetov2.csproj.AssemblyReference.cache differ
diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache
index 647574e..82bdfcd 100644
--- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache
@@ -1,5 +1 @@
-<<<<<<< HEAD
5f84ca15ab0cf8658a0603f2d37cc1ef407c340f
-=======
-04ff0eea2625c5f041dc8598762cddc9006f263e8231100b6f207f00fb8b7971
->>>>>>> cf456518544ecfa44f10e88e75e2bc14d31d6702
diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache
index 27cfc7b..c4f0af0 100644
Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ