fix merge error

knoguchi · knoguchi · commit d095e7936fbd · 2017-05-13T16:55:29.000-07:00
diff --git a/protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/schema/DescriptorLoaderTest.java b/protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/schema/DescriptorLoaderTest.java
@@ -13,9 +13,5 @@ public void testParsing() throws Exception
         ProtobufSchema nps = fds.forType("main1");
         assertNotNull(nps);
     }
-
-        ProtobufSchema schema = nativeSchema.forType("main1");
-        assertNotNull(schema);
-    }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,5 @@ public void testParsing() throws Exception`
`13`	`13`	`ProtobufSchema nps = fds.forType("main1");`
`14`	`14`	`assertNotNull(nps);`
`15`	`15`	`}`
`16`		`-`
`17`		`- ProtobufSchema schema = nativeSchema.forType("main1");`
`18`		`- assertNotNull(schema);`
`19`		`- }`
`20`	`16`	`}`
`21`	`17`