summaryrefslogtreecommitdiff
path: root/cad/linuxcnc-devel/files/patch-src_po_git-merge-po
diff options
context:
space:
mode:
Diffstat (limited to 'cad/linuxcnc-devel/files/patch-src_po_git-merge-po')
-rw-r--r--cad/linuxcnc-devel/files/patch-src_po_git-merge-po8
1 files changed, 0 insertions, 8 deletions
diff --git a/cad/linuxcnc-devel/files/patch-src_po_git-merge-po b/cad/linuxcnc-devel/files/patch-src_po_git-merge-po
deleted file mode 100644
index dde076301567..000000000000
--- a/cad/linuxcnc-devel/files/patch-src_po_git-merge-po
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/po/git-merge-po.orig 2016-06-25 02:19:12 UTC
-+++ src/po/git-merge-po
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash
- #
- # Custom Git merge driver - merges PO files using msgcat(1)
- #