Commit 4f875870 authored by Raja R Harinath's avatar Raja R Harinath

Remove stray conflict marker.

parent 618efe9b
......@@ -320,7 +320,6 @@
used for item_grid->selecting to avoid shutting down entirely the
formula selection range on mouse release.
>>>>>>> 1.164
1998-10-02 Vincent Renardias <vincent@waw.com>
* Changed 'es@mx' into 'es_MX' for locale stuff in
......
......@@ -320,7 +320,6 @@
used for item_grid->selecting to avoid shutting down entirely the
formula selection range on mouse release.
>>>>>>> 1.164
1998-10-02 Vincent Renardias <vincent@waw.com>
* Changed 'es@mx' into 'es_MX' for locale stuff in
......
......@@ -320,7 +320,6 @@
used for item_grid->selecting to avoid shutting down entirely the
formula selection range on mouse release.
>>>>>>> 1.164
1998-10-02 Vincent Renardias <vincent@waw.com>
* Changed 'es@mx' into 'es_MX' for locale stuff in
......
......@@ -320,7 +320,6 @@
used for item_grid->selecting to avoid shutting down entirely the
formula selection range on mouse release.
>>>>>>> 1.164
1998-10-02 Vincent Renardias <vincent@waw.com>
* Changed 'es@mx' into 'es_MX' for locale stuff in
......
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