All of lore.kernel.org
 help / color / mirror / Atom feed
From: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
To: kvm-devel@lists.sourceforge.net
Subject: [PATCH] janitorial: remove leftovers from merge conflict
Date: Tue, 6 May 2008 03:58:53 -0500	[thread overview]
Message-ID: <20080506085853.GC1688@tapir> (raw)

apparently harmless and unique

Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe>
---
 qemu/Makefile.target |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index cc66651..bb4b9a3 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -190,7 +190,6 @@ all: $(PROGS)
 
 #########################################################
 # cpu emulator library
-<<<<<<< HEAD:qemu/Makefile.target
 LIBOBJS=exec.o kqemu.o cpu-exec.o host-utils.o
 
 ifeq ($(NO_CPU_EMULATION), 1)
-- 
1.5.3.7


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone

             reply	other threads:[~2008-05-06  8:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-06  8:58 Carlo Marcelo Arenas Belon [this message]
2008-05-06 10:47 ` [PATCH] janitorial: remove leftovers from merge conflict Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080506085853.GC1688@tapir \
    --to=carenas@sajinet.com.pe \
    --cc=kvm-devel@lists.sourceforge.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.