Skip to content

A
apollo
Commit 40365e15 authored by lepdou's avatar lepdou
Browse files
Options

resolve conflict

parent 6b0ac1b4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
apollo-portal/src/test/java/com/ctrip/apollo/portal/ConfigServiceTest.java
View file @ 40365e15
...@@ -106,7 +106,6 @@ public class ConfigServiceTest extends AbstractPortalTest{ ...@@ -106,7 +106,6 @@ public class ConfigServiceTest extends AbstractPortalTest{
List<ItemDTO> itemDTOs = mockBaseItemHas3Key(); List<ItemDTO> itemDTOs = mockBaseItemHas3Key();
ItemChangeSets changeSets = new ItemChangeSets(); ItemChangeSets changeSets = new ItemChangeSets();
changeSets.setModifyBy("ll");
changeSets.addCreateItem(new ItemDTO("d", "c", "", 4)); changeSets.addCreateItem(new ItemDTO("d", "c", "", 4));
when(itemAPI.findItems(appId, Env.DEV, clusterName, namespaceName)).thenReturn(itemDTOs); when(itemAPI.findItems(appId, Env.DEV, clusterName, namespaceName)).thenReturn(itemDTOs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment