Projects >> cgeo >>13206cb835eb22aa49b198b892dcd7cf71f4ac82

Chunk
Conflicting content 
    private final static Pattern PATTERN_TRACKABLE_SpottedUser = Pattern.compile("
\\W*Recently Spotted:[^<]*
[^<]*
[^<]*In the hands of ([^<]+).[^<]*
", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_SpottedUnknown = Pattern.compile("
\\W*Recently Spotted:[^<]*
[^<]*
[^<]*Unknown Location[^<]*[^<]*
", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_SpottedOwner = Pattern.compile("
\\W*Recently Spotted:[^<]*
[^<]*
[^<]*In the hands of the owner[^<]*[^<]*
", Pattern.CASE_INSENSITIVE);
<<<<<<< HEAD
    private final static Pattern PATTERN_TRACKABLE_GOAL = Pattern.compile("
\\W*Current GOAL[^<]*
[^<]*
[^<]*
(.*?)
[^<]*
[^<]*
");
    private final static Pattern PATTERN_TRACKABLE_DETAILSIMAGE = Pattern.compile("
\\W*About This Item[^<]*
[^<]*
([^<]*
([^<]*]*>)?[^<]*
)?[^<]*]*>(.*)
[^<]*
");

=======
    private final static Pattern PATTERN_TRACKABLE_Goal = Pattern.compile("
\\W*Current GOAL[^<]*
[^<]*
[^<]*
(.*?)
[^<]*
[^<]*
");
    private final static Pattern PATTERN_TRACKABLE_DetailsImage = Pattern.compile("
\\W*About This Item[^<]*
[^<]*
([^<]*
([^<]*]*>)?[^<]*
)?[^<]*]*>(.*)
[^<]*
 
");
>>>>>>> 6887cefdf0964d58168253f8ffab9af7c9d79248
    private final static Pattern PATTERN_TRACKABLE_Icon = Pattern.compile("]*>", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_Type = Pattern.compile("\"([^\"]+)\"[^]*>", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_Distance = Pattern.compile("]*\\W*Tracking History \\(([0-9.,]+(km|mi))[^\\)]*\\)", Pattern.CASE_INSENSITIVE);
Solution content 
    private final static Pattern PATTERN_TRACKABLE_SpottedUser = Pattern.compile("
\\W*Recently Spotted:[^<]*
[^<]*
[^<]*In the hands of ([^<]+).[^<]*
", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_SpottedUnknown = Pattern.compile("
\\W*Recently Spotted:[^<]*
[^<]*
[^<]*Unknown Location[^<]*[^<]*
", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_SpottedOwner = Pattern.compile("
\\W*Recently Spotted:[^<]*
[^<]*
[^<]*In the hands of the owner[^<]*[^<]*
", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_GOAL = Pattern.compile("
\\W*Current GOAL[^<]*
[^<]*
[^<]*
(.*?)
[^<]*
[^<]*
");
    private final static Pattern PATTERN_TRACKABLE_DETAILSIMAGE = Pattern.compile("
\\W*About This Item[^<]*
[^<]*
([^<]*
([^<]*]*>)?[^<]*
)?[^<]*]*>(.*)
[^<]*
 
");
    private final static Pattern PATTERN_TRACKABLE_Icon = Pattern.compile("]*>", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_Type = Pattern.compile("\"([^\"]+)\"[^]*>", Pattern.CASE_INSENSITIVE);
    private final static Pattern PATTERN_TRACKABLE_Distance = Pattern.compile("]*\\W*Tracking History \\(([0-9.,]+(km|mi))[^\\)]*\\)", Pattern.CASE_INSENSITIVE);
File
cgBase.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
                    trackable.setImage(image);
                }
                if (details != null) {
<<<<<<< HEAD
                    trackable.setDetails(details);
=======
                    trackable.details = details.equals("No additional details available.") ? null : details;
>>>>>>> 6887cefdf0964d58168253f8ffab9af7c9d79248
                }
            }
        } catch (Exception e) {
Solution content 
                    trackable.setImage(image);
                }
                if (details != null && !details.equals("No additional details available.")) {
                    trackable.setDetails(details);
                }
            }
        } catch (Exception e) {
File
cgBase.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable