Fix merge conflict

qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java

@@ -603,44 +603,6 @@ class QJavalinImplementationTest extends QJavalinTestBase
 
 
 
-   /*******************************************************************************
-    ** test an update - posting the data as a multipart form
-    **
-    *******************************************************************************/
-   @Test
-   public void test_dataUpdateMultipartForm()
-   {
-      HttpResponse<String> response = Unirest.patch(BASE_URL + "/data/person/4")
-         .multiPartContent()
-         .field("firstName", "Free")
-         .field("birthDate", "")
-         .asString();
-
-      assertEquals(200, response.getStatus());
-      JSONObject jsonObject = JsonUtils.toJSONObject(response.getBody());
-      assertTrue(jsonObject.has("records"));
-      JSONArray records = jsonObject.getJSONArray("records");
-      assertEquals(1, records.length());
-      JSONObject record0 = records.getJSONObject(0);
-      assertTrue(record0.has("values"));
-      assertEquals("person", record0.getString("tableName"));
-      JSONObject values0 = record0.getJSONObject("values");
-      assertEquals(4, values0.getInt("id"));
-      assertEquals("Free", values0.getString("firstName"));
-
-      ///////////////////////////////////////////////////////////////////
-      // re-GET the record, and validate that birthDate was nulled out //
-      ///////////////////////////////////////////////////////////////////
-      response = Unirest.get(BASE_URL + "/data/person/4").asString();
-      assertEquals(200, response.getStatus());
-      jsonObject = JsonUtils.toJSONObject(response.getBody());
-      assertTrue(jsonObject.has("values"));
-      JSONObject values = jsonObject.getJSONObject("values");
-      assertFalse(values.has("birthDate"));
-   }
-
-
-
    /*******************************************************************************
     ** test a delete
     **