diff --git a/Amazon-SP-API-CSharp.sln b/Amazon-SP-API-CSharp.sln
index 4247902a..06c4c943 100644
--- a/Amazon-SP-API-CSharp.sln
+++ b/Amazon-SP-API-CSharp.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.31912.275
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{3472E85C-6C29-4196-AA16-B95898241C04}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FikaAmazonAPI", "Source\FikaAmazonAPI\FikaAmazonAPI.csproj", "{70A12C48-BD11-4485-9266-9D0D86D3821D}"
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{177F077C-82C9-4DBB-BA03-CF8E14D4AB4E}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
@@ -17,27 +15,29 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FikaAmazonAPI.SampleCode", "Source\FikaAmazonAPI.SampleCode\FikaAmazonAPI.SampleCode.csproj", "{FC494085-19C4-4835-B053-F9B74FFB978A}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FikaAmazonAPI", "Source\FikaAmazonAPI\FikaAmazonAPI.csproj", "{D6BE954D-174D-4C19-A0B6-46F020878E72}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {70A12C48-BD11-4485-9266-9D0D86D3821D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {70A12C48-BD11-4485-9266-9D0D86D3821D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {70A12C48-BD11-4485-9266-9D0D86D3821D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {70A12C48-BD11-4485-9266-9D0D86D3821D}.Release|Any CPU.Build.0 = Release|Any CPU
{FC494085-19C4-4835-B053-F9B74FFB978A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FC494085-19C4-4835-B053-F9B74FFB978A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FC494085-19C4-4835-B053-F9B74FFB978A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FC494085-19C4-4835-B053-F9B74FFB978A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D6BE954D-174D-4C19-A0B6-46F020878E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D6BE954D-174D-4C19-A0B6-46F020878E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D6BE954D-174D-4C19-A0B6-46F020878E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D6BE954D-174D-4C19-A0B6-46F020878E72}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
- {70A12C48-BD11-4485-9266-9D0D86D3821D} = {3472E85C-6C29-4196-AA16-B95898241C04}
{FC494085-19C4-4835-B053-F9B74FFB978A} = {3472E85C-6C29-4196-AA16-B95898241C04}
+ {D6BE954D-174D-4C19-A0B6-46F020878E72} = {3472E85C-6C29-4196-AA16-B95898241C04}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F072E7DD-BF35-43CC-BF83-E5947CA2D772}
diff --git a/Source/FikaAmazonAPI/FikaAmazonAPI.csproj b/Source/FikaAmazonAPI/FikaAmazonAPI.csproj
index b088d7dd..e74dcbc2 100644
--- a/Source/FikaAmazonAPI/FikaAmazonAPI.csproj
+++ b/Source/FikaAmazonAPI/FikaAmazonAPI.csproj
@@ -7,15 +7,9 @@
CSharp Amazon Sp API
true
8.0
-<<<<<<< HEAD
- 1.1.1
- 1.1.1
- 1.1.1
-=======
- 1.1.0-beta
- 1.0.45
- 1.0.45-alpha
->>>>>>> 50653b10f95a643e4dabb446a9904ab20004dfc1
+ 1.1.2
+ 1.1.2
+ 1.1.2
true
https://github.com/abuzuhri/Amazon-SP-API-CSharp
MIT