| commit | de7faae38c67faf90d078152e10ab8ce0514bb5e | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 11 Mar 2010 09:45:27 +0000 (11 11:45 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 11 Mar 2010 09:45:27 +0000 (11 11:45 +0200) | ||
| tree | d53633b9059fce35308ba819b9aa89793cfb68f6 | treesnapshot (tar.gz zip) |
| parent | 69dd59a66aaf56d1e8e4c96d0a0923c9cf8f79a0 | commitdiff |
Remove merge conflict markers left in target-i386/kvm.c.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
| target-i386/kvm.c | diffblobblamehistory |