resolve conflict

MBoretto · MBoretto · commit f11c153c590d · 2016-01-24T17:39:39.000+01:00
diff --git a/structure.sql b/structure.sql
@@ -1,4 +1,3 @@
-
 CREATE TABLE IF NOT EXISTS  `user` (
   `id` bigint NULL DEFAULT NULL COMMENT 'Unique user identifier',
   `first_name` CHAR(255) NOT NULL DEFAULT '' COMMENT 'User first name',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	CREATE TABLE IF NOT EXISTS `user` (
`3`	`2`	`id` bigint NULL DEFAULT NULL COMMENT 'Unique user identifier',
`4`	`3`	`first_name` CHAR(255) NOT NULL DEFAULT '' COMMENT 'User first name',