Resolved conflict on split-string.

Author Pascal J. Bourguignon <pjb@informatimago.com>
Author date 2015-07-08 21:34:47
Author local date 2015-07-08 23:34:47 +0200
Committer Pascal J. Bourguignon <pjb@informatimago.com>
Committer date 2015-07-08 21:34:47
Committer local date 2015-07-08 23:34:47 +0200
Commit 00d927c9acf9c7663eda0520e688216bb3c46fc8
Tree e4995d7b1b422006ace72d41d16d4da7b4c6e53e
Parent 4172a270a7c0d9347eb1fd22796b3f762b7bcd1e
Resolved conflict on split-string.
ViewGit