From 83c87e2e90b73baf66a6eae5f71fc70f8fbc0428 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Wed, 26 Aug 2015 13:01:22 +0200
Subject: Help: fix merge conflicts

---
 help/pa/pa.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'help/pa')

diff --git a/help/pa/pa.po b/help/pa/pa.po
index 8be6d960..37f3251d 100644
--- a/help/pa/pa.po
+++ b/help/pa/pa.po
@@ -96,7 +96,7 @@ msgid ""
 "To launch the <application>MATE Control Center</application>, type "
 "<command>mate-control-center</command> in a terminal window."
 msgstr ""
-"<application>ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ, ਇੱਕ ਟਰਮੀਨਲ ਝਰੋਖੇ 'ਚ <command>mate-control-"
+"<application>ਗਨੋਮ ਕੰਟਰੋਲ ਕੇਂਦਰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ</application>, ਇੱਕ ਟਰਮੀਨਲ ਝਰੋਖੇ 'ਚ <command>mate-control-"
 "center</command> ਲਿਖੋ।"
 
 #: C/control-center.xml:73(para)
-- 
cgit v1.2.1