Commit 2697a062 authored by jpekka's avatar jpekka

Removed a conflict indicator.

parent 3666b754
......@@ -57,7 +57,6 @@
(workbook_new_with_sheets): Update to more Excel friendly
names.
>>>>>>> 1.586
1999-07-02 Miguel de Icaza <miguel@gnu.org>
* doc/Design, doc/translating.sgml: small touchups.
......
......@@ -57,7 +57,6 @@
(workbook_new_with_sheets): Update to more Excel friendly
names.
>>>>>>> 1.586
1999-07-02 Miguel de Icaza <miguel@gnu.org>
* doc/Design, doc/translating.sgml: small touchups.
......
......@@ -57,7 +57,6 @@
(workbook_new_with_sheets): Update to more Excel friendly
names.
>>>>>>> 1.586
1999-07-02 Miguel de Icaza <miguel@gnu.org>
* doc/Design, doc/translating.sgml: small touchups.
......
......@@ -57,7 +57,6 @@
(workbook_new_with_sheets): Update to more Excel friendly
names.
>>>>>>> 1.586
1999-07-02 Miguel de Icaza <miguel@gnu.org>
* doc/Design, doc/translating.sgml: small touchups.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment