# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1192752213 0
# Node ID 5e056bb0109f3ee1716ba9e61bf3491168f64348
# Parent  1251cabc40b74f8332159b2f4fc02acf250144d0
Fix merge conflicts

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-271

diff -r 1251cabc40b7 -r 5e056bb0109f src/lisp.h
--- a/src/lisp.h	Fri Oct 19 00:00:21 2007 +0000
+++ b/src/lisp.h	Fri Oct 19 00:03:33 2007 +0000
@@ -1463,17 +1463,9 @@
 #define OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Objfwd)
 #define BUFFER_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Objfwd)
 #define BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
-<<<<<<< TREE
 #define SOME_BUFFER_LOCAL_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Some_Buffer_Local_Value)
-=======
-#define GC_BUFFER_LOCAL_VALUEP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Buffer_Local_Value)
->>>>>>> MERGE-SOURCE
 #define KBOARD_OBJFWDP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
-<<<<<<< TREE
-=======
-#define GC_KBOARD_OBJFWDP(x) (GC_MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Kboard_Objfwd)
 #define SAVE_VALUEP(x) (MISCP (x) && XMISCTYPE (x) == Lisp_Misc_Save_Value)
->>>>>>> MERGE-SOURCE
 
 
 /* True if object X is a pseudovector whose code is CODE.  */