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