]> git.ipfire.org Git - thirdparty/grub.git/commit
fix mismerge
authorVladimir Serbinenko <phcoder@gmail.com>
Mon, 8 May 2017 19:08:02 +0000 (21:08 +0200)
committerVladimir Serbinenko <phcoder@gmail.com>
Mon, 8 May 2017 19:08:02 +0000 (21:08 +0200)
commit642ff2676fa380ac030ac131ddee284a0a2a42e1
tree25a005fe6153ba8562064bc90b163bd88a9e66c9
parent46f08fb93b66af0a96ba070ea7aa664ce41e52be
fix mismerge
util/mkimage.c