| Chunk |
|---|
| Conflicting content |
|---|
import javax.inject.Inject; import javax.inject.Named; <<<<<<< HEAD ======= import org.resthub.core.audit.annotation.Auditable; >>>>>>> f43242ed6e7f37aa9ab09f23003e6ca0b15b51a8 import org.resthub.core.annotation.Auditable; import org.resthub.core.service.GenericResourceServiceImpl; |
| Solution content |
|---|
import javax.inject.Inject; import javax.inject.Named; import org.resthub.core.audit.annotation.Auditable; import org.resthub.core.service.GenericResourceServiceImpl; |
| File |
|---|
| GroupServiceImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import javax.inject.Inject; import javax.inject.Named; <<<<<<< HEAD ======= import org.resthub.core.audit.annotation.Auditable; >>>>>>> f43242ed6e7f37aa9ab09f23003e6ca0b15b51a8 import org.resthub.core.annotation.Auditable; import org.resthub.identity.dao.PermissionsOwnerDao; |
| Solution content |
|---|
import javax.inject.Inject; import javax.inject.Named; import org.resthub.core.audit.annotation.Auditable; import org.resthub.identity.dao.PermissionsOwnerDao; |
| File |
|---|
| UserServiceImpl.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |