Merge branch 'wking-drop-redundant-parentheses' into gh-pages

uzinaduzina · Mar 26, 2015 · 17d0a19 · 17d0a19
2 parents a904d10 + c0756e2
commit 17d0a19
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/03-filter.md b/03-filter.md
@@ -56,19 +56,22 @@ For example,
 we can ask for all information from the DR-1 site collected before 1930:
 
 ~~~ {.sql}
-SELECT * FROM Visited WHERE (site="DR-1") AND (dated<="1930-01-01");
+SELECT * FROM Visited WHERE site="DR-1" AND dated<="1930-00-00";
 ~~~
 
 |ident|site|dated     |
 |-----|----|----------|
 |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,