| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD //generated using Reflections JavaCodeSerializer [Tue Jan 15 17:39:31 EST 2013] ======= //generated using Reflections JavaCodeSerializer [Fri Jan 25 11:04:48 EST 2013] >>>>>>> 6b9bb2be7feeed2511db2ef97125d5fa6551ff0c package org.jboss.errai.reflections; import static org.jboss.errai.reflections.serializers.JavaCodeSerializer.*; |
| Solution content |
|---|
//generated using Reflections JavaCodeSerializer [Fri Jan 25 11:04:48 EST 2013] package org.jboss.errai.reflections; import static org.jboss.errai.reflections.serializers.JavaCodeSerializer.*; |
| File |
|---|
| MyTestModelStore.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |