homepage: https://github.com/ElastiLotem/resolve-trivial-conflicts
changelog-type: ''
hash: 8751196b2f51f916e9241cde93f5cbe38e9f6b0077befbe193211716e2aab03c
test-bench-deps: {}
maintainer: eyal.lotem@gmail.com
synopsis: Remove trivial conflict markers in a git repository
changelog: ''
basic-deps:
  unix: ! '>=2.7'
  base: ! '>=4.6 && <5'
  Diff: ! '>=0.3'
  filepath: ! '>=1.3'
  process: ! '>=1.2'
  ansi-terminal: ! '>=0.6.2'
  base-compat: ! '>=0.8.2 && <0.9'
  mtl: ! '>=2.1'
  directory: ! '>=1.2'
all-versions:
- '0.2'
- '0.2.0.1'
- '0.2.0.2'
- '0.3'
- '0.3.0.1'
- '0.3.0.2'
- '0.3.1'
- '0.3.1.1'
- '0.3.1.2'
author: Eyal Lotem
latest: '0.3.1.2'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

homepage: https://github.com/ElastiLotem/resolve-trivial-conflicts
changelog-type: ''
hash: 35d15ecacf5e6cee5bc22ba669deaa589635e691c9077c55511e23ff3ff38e29
test-bench-deps: {}
maintainer: eyal.lotem@gmail.com
synopsis: Remove trivial conflict markers in a git repository
changelog: ''
basic-deps:
  unix: ! '>=2.7'
  base: ! '>=4.6 && <5'
  Diff: ! '>=0.3'
  filepath: ! '>=1.3'
  process: ! '>=1.2'
  ansi-terminal: ! '>=0.6.2'
  base-compat: ! '>=0.8.2 && <0.9'
  mtl: ! '>=2.1'
  optparse-applicative: ! '>=0.11 && <0.13'
  directory: ! '>=1.2'
all-versions:
- '0.2'
- '0.2.0.1'
- '0.2.0.2'
- '0.3'
- '0.3.0.1'
- '0.3.0.2'
- '0.3.1'
- '0.3.1.1'
- '0.3.1.2'
- '0.3.2'
author: Eyal Lotem
latest: '0.3.2'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

Update from Hackage at 2015-12-24T22:53:58+0000
Update from Hackage at 2015-12-24T22:53:58+0000
