03-filter.md: Remove conflict-markers around the date type callout

These were added in c0756e2 (fixing merge conflict, 2015-03-26). I've resolved them by removing the parentheses comment (following 06563c2, 03-filter.md: Drop redundant parentheses, 2015-02-25) and adding the date type callout header (following 23ca7c1, 03-filter.md: Use a callout box for the blurb about date types, 2015-03-25).
uzinaduzina · Mar 28, 2015 · a9df6c1 · a9df6c1
1 parent a8dd290
commit a9df6c1
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/03-filter.md b/03-filter.md
@@ -64,14 +64,8 @@ SELECT * FROM Visited WHERE site='DR-1' AND dated<'1930-00-00';
 |619  |DR-1|1927-02-08|
 |622  |DR-1|1927-02-10|
 
-<<<<<<< HEAD
-(The parentheses around the individual tests aren't strictly required,
-but they help make the query easier to read.)
-
 > ## Date types {.callout}
 >
-=======
->>>>>>> 06563c2f46681b04db26066a231d9dc237c0ffa0
 > Most database managers have a special data type for dates.
 > In fact, many have two:
 > one for dates,