Commit d442225b authored by Stanislav Brabec's avatar Stanislav Brabec

Removed conflict.

parent 157be09f
......@@ -196,7 +196,6 @@
* plug-ins/common/gee.c: Using "env" instead of "environ" caused
a clash. Changed the other one to "environment".
>>>>>>> 1.3131
2000-12-17 Tor Lillqvist <tml@iki.fi>
* config.h.win32: Typo.
......
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