janitorial: remove leftovers from merge conflict
PATCH 1/1 janitorial: remove leftovers from merge conflict
apparently harmless and unique
Signed-off-by Carlo Marcelo Arenas Belon <[email protected]>
--- qemu/Makefile.target | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
qemu/Makefile.target +0 -1
@@ -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)
Signature · 8 lines
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
Quoted 3 lines · Carlo Marcelo Arenas Belon
apparently harmless and unique
Sloppy me. Applied, thanks.
Signature · 8 lines
Do not meddle in the internals of kernels, for they are subtle and quick to panic. ------------------------------------------------------------------------- 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