Merge pull request #40 from SitecoreUnicorn/develop

Merged 2.1.2 to master
SitecoreUnicorn · Sep 8, 2020 · 5abca44 · 5abca44
2 parents f6b1686 + 9fa1ab7
commit 5abca44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Rainbow.Storage.Sc/Deserialization/DefaultDeserializer.cs b/src/Rainbow.Storage.Sc/Deserialization/DefaultDeserializer.cs
@@ -648,8 +648,6 @@ protected virtual Tuple<bool,Item> PasteVersion(Item item, IItemVersion serializ
 			}
 			finally
 			{
-				commitEdit = false;
-
 				if (languageVersionItem.Editing.IsEditing)
 					languageVersionItem.Editing.CancelEdit();
 			}

diff --git a/src/SharedAssemblyInfo.cs b/src/SharedAssemblyInfo.cs
@@ -4,7 +4,7 @@
 
 [assembly: AssemblyProduct("Rainbow")]
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
-[assembly: AssemblyInformationalVersion("2.1.1")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
+[assembly: AssemblyInformationalVersion("2.1.2")]
 [assembly: CLSCompliant(false)]
-Original file line number
+Diff line change
@@ Expand Up @@
     			}
     			finally
     			{
-    				commitEdit = false;
     				if (languageVersionItem.Editing.IsEditing)
     					languageVersionItem.Editing.CancelEdit();
     			}
@@ Expand Down @@