remove the 0.6.0 migration file because we are now adding those fields as part...

remove the 0.6.0 migration file because we are now adding those fields as part of the initial tables.

resources/migrations/liquibase.json

@@ -2,7 +2,6 @@
   "databaseChangeLog": [
       {"include": {"file": "migrations/liquibase_0.1.0.json"}},
       {"include": {"file": "migrations/liquibase_0.5.0.json"}},
-      {"include": {"file": "migrations/liquibase_0.6.0.json"}},
       {"include": {"file": "migrations/004_add_setting_table.json"}}
   ]
 }

resources/migrations/liquibase_0.1.0.json

@@ -106,6 +106,14 @@
                     "constraints": {"nullable": false}
                   }
                 },
+                {
+                  "column": {
+                    "name": "password_salt",
+                    "type": "varchar(254)",
+                    "defaultValue": "default",
+                    "constraints": {"nullable": false}
+                  }
+                },
                 {
                   "column": {
                     "name": "date_joined",
@@ -140,6 +148,18 @@
                     "type": "boolean",
                     "constraints": {"nullable": false}
                   }
+                },
+                {
+                  "column": {
+                    "name": "reset_token",
+                    "type": "varchar(254)"
+                  }
+                },
+                {
+                  "column": {
+                    "name": "reset_triggered",
+                    "type": "BIGINT"
+                  }
                 }
               ]
             }
@@ -2171,4 +2191,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}

resources/migrations/liquibase_0.6.0.json

-{
-  "databaseChangeLog": [
-    {
-      "changeSet": {
-        "id": "3",
-        "author": "agilliland",
-        "changes": [
-          {
-            "addColumn": {
-              "tableName": "core_user",
-              "columns": [
-                {
-                  "column": {
-                    "name": "password_salt",
-                    "type": "varchar(254)",
-                    "defaultValue": "default",
-                    "constraints": {"nullable": false}
-                  }
-                },
-                {
-                  "column": {
-                    "name": "reset_token",
-                    "type": "varchar(254)"
-                  }
-                },
-                {
-                  "column": {
-                    "name": "reset_triggered",
-                    "type": "BIGINT"
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
\ No newline at end of file