<commit_before>{$} = require 'atom'
{Emitter} = require 'emissary'

{Side, OurSide, TheirSide} = require './side'
Navigator = require './navigator'

CONFLICT_REGEX = /^<{7} (.+)\n([^]*?)={7}\n([^]*?)>{7} (.+)\n?/mg

INVALID = null
TOP = 'top'
MIDDLE = 'middle'
BOTTOM = 'bottom'

class Marker

  options =
    persistent: false
    invalidate: 'never'

  constructor: (@state, @editor) ->
    @position = INVALID

  start: (@m) ->
    @startRow = @m.range.start.row
    @endRow = @m.range.end.row<commit_msg>:lipstick: Conflict regex fits windows too<commit_after>{$} = require 'atom'
{Emitter} = require 'emissary'

{Side, OurSide, TheirSide} = require './side'
Navigator = require './navigator'

CONFLICT_REGEX = /^<{7} (.+)\r?\n([^]*?)={7}\r?\n([^]*?)>{7} (.+)\r?\n?/mg

INVALID = null
TOP = 'top'
MIDDLE = 'middle'
BOTTOM = 'bottom'

class Marker

  options =
    persistent: false
    invalidate: 'never'

  constructor: (@state, @editor) ->
    @position = INVALID

  start: (@m) ->
    @startRow = @m.range.start.row
    @endRow = @m.range.end.row
{'fraction_non_alphanumeric': 0.21631878557874762, 'fraction_numerical': 0.0056925996204933585, 'mean_word_length': 3.606986899563319, 'pattern_counts': {'":': 0, '<': 5, '<?xml version=': 0, '>': 9, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2838473', 'n_tokens_mistral': 419, 'n_tokens_neox': 414, 'n_words': 92}