| Chunk |
|---|
| Conflicting content |
|---|
public static final String MANIFEST_12SUBSCRIPTIONS = "manifest-automation-CLI-12subscriptions.zip"; public static final String MANIFEST_2SUBSCRIPTIONS = "manifest-automation-CLI-2subscriptions.zip"; <<<<<<< HEAD public static final String MANIFEST_CLI1 = "katello-CLI-1.zip"; public static final String MANIFEST_CLI2 = "katello-CLI-2.zip"; ======= public static final String MANIFEST_KATELLO_QA_ORG = "manifest-KatelloQAOrg-gkhachik-BRQ-30subscriptions.zip"; // access.redhat.com; ( gkhachik-BRQ-30subscriptions ) >>>>>>> 012bbf495733999116329f66602d79b18f7b3d58 // ** ** ** ** ** ** ** Class members public String name; |
| Solution content |
|---|
public static final String MANIFEST_12SUBSCRIPTIONS = "manifest-automation-CLI-12subscriptions.zip"; public static final String MANIFEST_2SUBSCRIPTIONS = "manifest-automation-CLI-2subscriptions.zip"; public static final String MANIFEST_CLI1 = "katello-CLI-1.zip"; public static final String MANIFEST_CLI2 = "katello-CLI-2.zip"; public static final String MANIFEST_KATELLO_QA_ORG = "manifest-KatelloQAOrg-gkhachik-BRQ-30subscriptions.zip"; // access.redhat.com; ( gkhachik-BRQ-30subscriptions ) // ** ** ** ** ** ** ** Class members public String name; |
| File |
|---|
| KatelloProvider.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Comment |