Update

jonnysoe · Dec 21, 2016 · a4ff551 · a4ff551
1 parent 067c3ad
commit a4ff551
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,5 @@ tests/sched.h
 tests/semaphore.h
 tests/benchlib.o
 tests/SIZES.*
-tests/*.log
+tests/*.log
+/.project
diff --git a/tests/ChangeLog b/tests/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< Upstream, based on master
 2016-12-21  Ross Johnson <ross dot johnson at homemail dot com dot au>
 
 	* mutex6.c: fix random failures by using a polling loop to replace
@@ -11,10 +10,7 @@
 	* mutex8n.c: Likewise.
 	* semaphore5.c: don't fail on expected sem_destroy EBUSY.
 
-2016-124-18  Ross Johnson <ross dot johnson at homemail dot com dot au>
-=======
 2016-12-20  Ross Johnson <ross dot johnson at homemail dot com dot au>
->>>>>>> d1c1032 Initial version 3 commit; see the ChangeLogs
 
 	* all (PTW32_*): rename to __PTW32_*.
 	(ptw32_*): rename to __ptw32_*.