resolve conflict

40365e15 · lepdou · 6b0ac1b4 · 40365e15
Commit 40365e15 authored Apr 18, 2016 by lepdou
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

ConfigServiceTest.java .../test/java/com/ctrip/apollo/portal/ConfigServiceTest.java +0 -1

No files found.
--- a/apollo-portal/src/test/java/com/ctrip/apollo/portal/ConfigServiceTest.java
+++ b/apollo-portal/src/test/java/com/ctrip/apollo/portal/ConfigServiceTest.java
@@ -106,7 +106,6 @@ public class ConfigServiceTest extends AbstractPortalTest{

    List<ItemDTO> itemDTOs = mockBaseItemHas3Key();
    ItemChangeSets changeSets = new ItemChangeSets();
-    changeSets.setModifyBy("ll");
    changeSets.addCreateItem(new ItemDTO("d", "c", "", 4));

    when(itemAPI.findItems(appId, Env.DEV, clusterName, namespaceName)).thenReturn(itemDTOs);