fix merge artifact
authorChristian Grothoff <christian@grothoff.org>
Thu, 18 Oct 2018 14:27:54 +0000 (16:27 +0200)
committerChristian Grothoff <christian@grothoff.org>
Thu, 18 Oct 2018 14:27:54 +0000 (16:27 +0200)
commite6c64fc035500bc098777e7687dc3da5b2aac35c
treef98d594238e46e5bb8d118c683809bf004eeaa1d
parente76f4a66930043ede71300fffe38ab48746ca5b5
fix merge artifact
README