Fix merge conflict

dotnet · Jul 23, 2020 · 280bdf4 · 280bdf4
1 parent 6fff28c
commit 280bdf4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Compilers/CSharp/Portable/Errors/MessageID.cs b/src/Compilers/CSharp/Portable/Errors/MessageID.cs
@@ -208,7 +208,8 @@ internal enum MessageID
         IDS_FeatureRecords = MessageBase + 12782,
         IDS_FeatureNullPointerConstantPattern = MessageBase + 12783,
         IDS_FeatureModuleInitializers = MessageBase + 12784,
-        IDS_FeatureDefaultTypeParameterConstraint = MessageBase + 12785,
+        IDS_FeatureTargetTypedConditional = MessageBase + 12785,
+        IDS_FeatureDefaultTypeParameterConstraint = MessageBase + 12786,
     }
 
     // Message IDs may refer to strings that need to be localized.