* lisp/emacs-lisp/seq.el (seq-concatenate): Unautoload (merge fix).

gitmerge-skip-regexp does not handle line breaks.

diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el
index 64d7e533751bdcd9bea33983da76b89e8d2bd06c..31c15fea90dec7b1395769f0b4297a7144b7f649 100644 (file)
--- a/lisp/emacs-lisp/seq.el
+++ b/lisp/emacs-lisp/seq.el
@@ -284,9 +284,6 @@ sorted.  FUNCTION must be a function of one argument."
 (cl-defmethod seq-reverse ((sequence sequence))
   (reverse sequence))
 
-;; We are autoloading seq-concatenate because cl-concatenate needs
-;; that when it's inlined, per the cl-proclaim in cl-macs.el.
-;;;###autoload
 (cl-defgeneric seq-concatenate (type &rest sequences)
   "Concatenate SEQUENCES into a single sequence of type TYPE.
 TYPE must be one of following symbols: vector, string or list.