homepage: https://github.com/ElastiLotem/resolve-trivial-conflicts
changelog-type: ''
hash: 440dbca535d14fa2f870500f7f29a5ddefb093ef04f7f49978153002d3f65c14
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 && <4.8'
  Diff: ! '>=0.3 && <0.4'
  filepath: ==1.3.*
  process: ==1.2.*
  ansi-terminal: ! '>=0.6.2 && <0.6.3'
  mtl: ! '>=2.1 && <2.3'
  directory: ==1.2.*
all-versions:
- '0.2'
- '0.2.0.1'
- '0.2.0.2'
author: Eyal Lotem
latest: '0.2.0.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: 65033f06162146f552e226c88322b4b0efa1dfad6def58833d7fdcbc97e873cf
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'
  mtl: ! '>=2.1'
  directory: ! '>=1.2'
all-versions:
- '0.2'
- '0.2.0.1'
- '0.2.0.2'
- '0.3'
- '0.3.0.1'
author: Eyal Lotem
latest: '0.3.0.1'
description-type: haddock
description: Remove trivial conflict markers in a git repository
license-name: GPL-2

Update from Hackage at 2015-07-06T10:39:30+0000
Update from Hackage at 2015-07-06T10:39:30+0000
