Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b35b0886
Commit
b35b0886
authored
Jan 13, 2013
by
Romain Francoise
Browse files
Delete merge marker.
parent
c0511b57
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
lisp/gnus/ChangeLog
lisp/gnus/ChangeLog
+0
-1
No files found.
lisp/gnus/ChangeLog
View file @
b35b0886
...
...
@@ -43,7 +43,6 @@
(mml-smime-epg-find-usable-secret-key): New helper function copied from
mml2015.el.
>>>>>>> MERGE-SOURCE
2012-12-31 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-msg.el (gnus-inews-insert-gcc): Don't insert Gcc headers if Gnus
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment