oops left over bit

2012-10-19 08:41:36 +01:00 · 2012-10-19 08:41:36 +01:00 · 51d2f8149f
commit 51d2f8149f
parent d629e0cba7
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -68,10 +68,7 @@
 - png save compression range was wrong
 - more/moreeq was wrong
 - vips7 ppm save with options was broken 
-<<<<<<< HEAD
-=======
 - don't cache write operations
->>>>>>> origin/master

 18/6/12 started 7.28.9
 - slightly more memory debugging output