homepage: https://github.com/Peaker/git-mediate
changelog-type: ''
hash: 29b387c86ada8cef8d898f022c746f54081e59e5166bd210a48ebe847297c479
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.8 && <5'
  Diff: ! '>=0.3'
  filepath: ! '>=1.3'
  process: ! '>=1.2'
  ansi-terminal: ! '>=0.6.2'
  base-compat: ! '>=0.8.2 && <0.10'
  mtl: ! '>=2.1'
  optparse-applicative: ! '>=0.11 && <0.15'
  directory: ! '>=1.2'
all-versions:
- '1.0.1'
- '1.0.2'
- '1.0.3'
author: Eyal Lotem
latest: '1.0.3'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

homepage: https://github.com/Peaker/git-mediate
changelog-type: ''
hash: d34f4c9968228bbe059cff6ae37246ce1fd3af46cafa14a644e7b9b7ccf2501d
test-bench-deps: {}
maintainer: eyal.lotem@gmail.com
synopsis: Remove trivial conflict markers in a git repository
changelog: ''
basic-deps:
  base: ! '>=4.8 && <5'
  Diff: ! '>=0.3'
  unix-compat: ! '>=0.4.2.0'
  filepath: ! '>=1.3'
  process: ! '>=1.2'
  ansi-terminal: ! '>=0.6.2'
  base-compat: ! '>=0.8.2 && <0.11'
  mtl: ! '>=2.1'
  optparse-applicative: ! '>=0.11 && <0.15'
  directory: ! '>=1.2'
all-versions:
- '1.0.1'
- '1.0.2'
- '1.0.3'
- '1.0.4'
author: Eyal Lotem
latest: '1.0.4'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

Update from Hackage at 2018-07-24T22:13:02Z
Update from Hackage at 2018-07-24T22:13:02Z
