drh 79b9831cdd Remove an incorrect test case from conflict2.test.
FossilOrigin-Name: 427612efc169c8ebe94a8b586d7abd0fcd43d0d0
2013-11-06 11:46:48 +00:00
..
2013-10-31 06:13:57 +00:00
2013-09-13 21:01:56 +00:00
2013-09-11 14:57:11 +00:00
2013-08-28 19:01:07 +00:00