| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD /* The following code was generated by JFlex 1.4.3 on 10/11/11 4:49 PM */ ======= /* The following code was generated by JFlex 1.4.3 on 10/11/11 4:08 PM */ >>>>>>> 6d1ee33962f36bc5bc025a6d71c49687409ea524 package com.rapleaf.jack.util; import java.io.IOException; |
| Solution content |
|---|
<<<<<<< HEAD /* The following code was generated by JFlex 1.4.3 on 10/11/11 4:49 PM */ ======= /* The following code was generated by JFlex 1.4.3 on 10/11/11 4:08 PM */ >>>>>>> 6d1ee33962f36bc5bc025a6d71c49687409ea524 package com.rapleaf.jack.util; import java.io.IOException; |
| File |
|---|
| MysqlFlex.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
/** * This class is a scanner generated by * JFlex 1.4.3 <<<<<<< HEAD * on 10/11/11 4:49 PM from the specification file ======= * on 10/11/11 4:08 PM from the specification file >>>>>>> 6d1ee33962f36bc5bc025a6d71c49687409ea524 * src/jflex/mysql.flex */ class MysqlFlex { |
| Solution content |
|---|
/** * This class is a scanner generated by * JFlex 1.4.3 * on 10/11/11 4:08 PM from the specification file * src/jflex/mysql.flex */ class MysqlFlex { |
| File |
|---|
| MysqlFlex.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |