Merge remote-tracking branch 'upstream/master'

MartyBurns · MartyBurns · commit d94ab0470c35 · 2014-01-05T16:58:40.000-05:00
aborts
diff --git a/etc/prepopulatesql_localhost8080.sql b/etc/prepopulatesql_localhost8080.sql
@@ -1,4 +1,6 @@
 USE `datacustodian`;
+
+# Populate kind
 INSERT INTO service_categories (kind) VALUES (0);
 INSERT INTO service_categories (kind) VALUES (1);
 INSERT INTO service_categories (kind) VALUES (2);
