Projects >> azure-sdk-for-java >>73b6643cf2c4196b3b7ca7402f9423bbb1781727

Chunk
Conflicting content 
    public void canCreateContentKey() throws Exception {
        // Arrange
        String testCanCreateContentKeyId = createRandomContentKeyId();
<<<<<<< HEAD
        String testCanCreateContentKeyName = testContentKeyPrefix + "testCanCreateContentKey";
=======
        String testCanCreateContentKeyName = "testCanCreateContentKey";
        String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));
>>>>>>> 84403a6976eabeab472d6efaf9334f5aa4a23624

        // Act
        ContentKeyInfo contentKeyInfo = service.create(ContentKey
Solution content 
    public void canCreateContentKey() throws Exception {
        // Arrange
        String testCanCreateContentKeyId = createRandomContentKeyId();
        String testCanCreateContentKeyName = testContentKeyPrefix + "testCanCreateContentKey";
        String protectionKeyId = service.action(ProtectionKey.getProtectionKeyId(testContentKeyType));

        // Act
        ContentKeyInfo contentKeyInfo = service.create(ContentKey
File
ContentKeyIntegrationTest.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable