Projects >> core >>f046be1f80ee42bab27359d3d2d22e9df2d38f42

Chunk
Conflicting content 
//    UsersCountryConditionletFTest.class,
    ActionResourceFTest.class,
    RulesCacheFTest.class,
<<<<<<< HEAD
    PersonaActionletFTest.class
=======
    PersonaActionletTest.class,
    VisitedUrlConditionletTest.class,
    VisitedUrlConditionletFTest.class
>>>>>>> 4a7bae9f3e401bc73bb1c547158c30473d25e333
})
public class AllTestsSuite {
Solution content 
//    UsersCountryConditionletFTest.class,
    ActionResourceFTest.class,
    RulesCacheFTest.class,
    PersonaActionletFTest.class,
	VisitedUrlConditionletTest.class,
	VisitedUrlConditionletFTest.class
})
public class AllTestsSuite {
File
AllTestsSuite.java
Developer's decision
Manual
Kind of conflict
Annotation