merge conflict

majiccode · majiccode · commit a4a79438cf4b · 2019-08-06T13:57:09.000+01:00
diff --git a/Sdl.Web.Tridion.Templates.R2/Data/DataModelBuilder.cs b/Sdl.Web.Tridion.Templates.R2/Data/DataModelBuilder.cs
@@ -159,12 +159,8 @@ private static object GetTypedArrayOfValues<T>(List<T> fieldValues)
         {
             List<string> strings = fieldValues.OfType<string>().Select(v => v).ToList();
             List<RichTextData> richTextDatas = fieldValues.OfType<RichTextData>().Select(v => v).ToList();
-<<<<<<< HEAD
-            if (richTextDatas.Count == fieldValues.Count) return richTextDatas;
-=======
             if (richTextDatas.Count == fieldValues.Count) return richTextDatas.ToArray();
             if (strings.Count == fieldValues.Count) return strings.ToArray();
->>>>>>> Stash/release/2.0
             if (richTextDatas.Count + strings.Count == fieldValues.Count)
             {
                 RichTextData[] richTextData = new RichTextData[fieldValues.Count];

Original file line number	Diff line number	Diff line change
`@@ -159,12 +159,8 @@ private static object GetTypedArrayOfValues<T>(List<T> fieldValues)`
`159`	`159`	`{`
`160`	`160`	`List<string> strings = fieldValues.OfType<string>().Select(v => v).ToList();`
`161`	`161`	`List<RichTextData> richTextDatas = fieldValues.OfType<RichTextData>().Select(v => v).ToList();`
`162`		`-<<<<<<< HEAD`
`163`		`- if (richTextDatas.Count == fieldValues.Count) return richTextDatas;`
`164`		`-=======`
`165`	`162`	`if (richTextDatas.Count == fieldValues.Count) return richTextDatas.ToArray();`
`166`	`163`	`if (strings.Count == fieldValues.Count) return strings.ToArray();`
`167`		`->>>>>>> Stash/release/2.0`
`168`	`164`	`if (richTextDatas.Count + strings.Count == fieldValues.Count)`
`169`	`165`	`{`
`170`	`166`	`RichTextData[] richTextData = new RichTextData[fieldValues.Count];`