DEV Community

Discussion on: How to "Resolve conflicts" on GitHub pull requests (Solved)

View post
Collapse
 
lancergreg profile image
Roman •

<<<<<<< destination:a48f05bd57e26de613a9c6d1035fdb4341f0f30e

                    z => string.IsNullOrEmpty(z.LogicalOperator) ? (LogicalOperator?)null : (LogicalOperator)Enum.Parse(typeof(LogicalOperator), z.LogicalOperator, true))); ;

=======

                    z => string.IsNullOrEmpty(z.LogicalOperator) ? (LogicalOperator?)null : (LogicalOperator)Enum.Parse(typeof(LogicalOperator), z.LogicalOperator, true)));

source:28efba2a88cbb1d26e7d2d2b77507125655ab4d2