Fix merge conflicts

Caitlin Bales (MSFT) · Caitlin Bales (MSFT) · commit 07c7ea714277 · 2017-05-02T10:48:03.000-07:00
diff --git a/Templates/CSharp/Model/EntityType.cs.tt b/Templates/CSharp/Model/EntityType.cs.tt
@@ -89,7 +89,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>
 <# } #>
         /// </summary>
         <#=attributeDefinition#>
-        public I<#=propertyCollectionPage#> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }
+        public I<#=propertyCollectionPage#> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }
     <#
                 }
                 else
@@ -104,7 +104,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>
 <# } #>
         /// </summary>
         <#=attributeDefinition#>
-        public IEnumerable<<#=propertyType#>> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }
+        public IEnumerable<<#=propertyType#>> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }
     <#
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>`
`89`	`89`	`<# } #>`
`90`	`90`	`/// </summary>`
`91`	`91`	`<#=attributeDefinition#>`
`92`		`- public I<#=propertyCollectionPage#> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }`
	`92`	`+ public I<#=propertyCollectionPage#> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }`
`93`	`93`	`<#`
`94`	`94`	`}`
`95`	`95`	`else`
`@@ -104,7 +104,7 @@ namespace <#=entity.Namespace.GetNamespaceName()#>`
`104`	`104`	`<# } #>`
`105`	`105`	`/// </summary>`
`106`	`106`	`<#=attributeDefinition#>`
`107`		`- public IEnumerable<<#=propertyType#>> <#=propertyName.GetSanitizedPropertyName(null, true)#> { get; set; }`
	`107`	`+ public IEnumerable<<#=propertyType#>> <#=propertyName.GetSanitizedPropertyName()#> { get; set; }`
`108`	`108`	`<#`
`109`	`109`	`}`
`110`	`110`	`}`