From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Sun, 22 Nov 2009 08:12:44 +0000 (-0600)
Subject: Fix conflict
X-Git-Tag: 0.97~5149
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=57fe0dea488853c09ba08af4780a7f36080c288b

Fix conflict
---

57fe0dea488853c09ba08af4780a7f36080c288b
diff --cc Makefile
index f85dbb9bee,6aee3e329d..e5229ef7df
--- a/Makefile
+++ b/Makefile
@@@ -44,9 -44,9 +44,10 @@@ DLL_OBJS = $(PLAF_DLL_OBJS) 
  	vm/compaction.o \
  	vm/contexts.o \
  	vm/data_heap.o \
+ 	vm/data_heap_checker.o \
  	vm/debug.o \
  	vm/dispatch.o \
 +	vm/embedded_pointers.o \
  	vm/errors.o \
  	vm/factor.o \
  	vm/free_list.o \