Fix merge conflict

Author: schittir

clang/include/clang/Sema/Sema.h

@@ -10045,10 +10045,6 @@ class Sema final {
   bool checkAllowedSYCLInitializer(VarDecl *VD,
                                    bool CheckValueDependent = false);
 
-  // Adds an intel_reqd_sub_group_size attribute to a particular declaration.
-  void addIntelReqdSubGroupSizeAttr(Decl *D, const AttributeCommonInfo &CI,
-                                    Expr *E);
-
   // Adds an scheduler_target_fmax_mhz intel_reqd_sub_group_size attribute to a
   // particular declaration.
   void addSYCLIntelSchedulerTargetFmaxMhzAttr(Decl *D,