Index: tests/.expect/linkoncedestructor.txt
===================================================================
--- tests/.expect/linkoncedestructor.txt	(revision 6018ddb9b78727195a7bc9a68a40e3fb3449f935)
+++ 	(revision )
@@ -1,1 +1,0 @@
-Destructor called
Index: tests/Makefile.am
===================================================================
--- tests/Makefile.am	(revision 6018ddb9b78727195a7bc9a68a40e3fb3449f935)
+++ tests/Makefile.am	(revision a0548c298812fe171176559746d6d55e06664ac4)
@@ -119,5 +119,4 @@
 .PHONY : concurrency list .validate .test_makeflags
 .INTERMEDIATE : .validate .validate.cfa .test_makeflags
-<<<<<<< HEAD
 EXTRA_PROGRAMS = array-collections/boxed \
 	avl_test \
@@ -127,7 +126,4 @@
 	linking/mangling/anon \
 	.dummy_hack # build but do not install
-=======
-EXTRA_PROGRAMS = array-collections/boxed avl_test linkonce linkoncedestructor linking/mangling/anon .dummy_hack # build but do not install
->>>>>>> parent of a56d544a4 (cleanup and add tests)
 EXTRA_DIST = test.py \
 	pybin/__init__.py \
Index: tests/concurrency/waitfor/.expect/autogen_destructor.txt
===================================================================
--- tests/concurrency/waitfor/.expect/autogen_destructor.txt	(revision a0548c298812fe171176559746d6d55e06664ac4)
+++ tests/concurrency/waitfor/.expect/autogen_destructor.txt	(revision a0548c298812fe171176559746d6d55e06664ac4)
@@ -0,0 +1,1 @@
+Destructor called