Remove merge conflict on r.cost algorithms

qgis · Mar 19, 2016 · eb186c4 · eb186c4
1 parent 5b11ba1
commit eb186c4
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 41 deletions.
diff --git a/python/plugins/processing/algs/grass7/description/r.cost.coords.txt b/python/plugins/processing/algs/grass7/description/r.cost.coords.txt
diff --git a/python/plugins/processing/algs/grass7/description/r.cost.points.txt b/python/plugins/processing/algs/grass7/description/r.cost.points.txt
diff --git a/python/plugins/processing/algs/grass7/description/r.cost.rast.txt b/python/plugins/processing/algs/grass7/description/r.cost.rast.txt