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
efce5ce2
Commit
efce5ce2
authored
Sep 15, 2006
by
Reiner Steib
Browse files
Fix previous commit: Remove conflict marker. Undo unification of Pavel
Janik's name.
parent
91a2acb2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
lispref/ChangeLog
lispref/ChangeLog
+1
-2
No files found.
lispref/ChangeLog
View file @
efce5ce2
...
...
@@ -19,7 +19,6 @@
(
Basic
Char
Syntax
,
General
Escape
Syntax
)
(
Ctl
-
Char
Syntax
,
Meta
-
Char
Syntax
):
New
subnodes
.
>>>>>>>
1.751
2006
-
09
-
11
Richard
Stallman
<
rms
@
gnu
.
org
>
*
display
.
texi
(
Display
Table
Format
):
Wording
clarification
.
...
...
@@ -4881,7 +4880,7 @@
(
info
):
Add
target
.
(
installall
):
Target
removed
.
2001
-
10
-
31
Pavel
Jan
,
A
m
(
Bk
<
Pavel
@
Janik
.
cz
>
2001
-
10
-
31
Pavel
Jan
,
B
m
(
Bk
<
Pavel
@
Janik
.
cz
>
*
tips
.
texi
(
Coding
Conventions
):
Fix
typo
.
...
...
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