Merge branch 'QA_4_6-security' into master-security

phpmyadmin · Jul 12, 2016 · e9d5efd · e9d5efd
2 parents 2424611 + 1290f98
commit e9d5efd
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/po/ko.po b/po/ko.po
@@ -7179,7 +7179,6 @@ msgstr "연관된 테이블"
 #| "types[/a] for an example."
 msgid ""
 "See [doc@authentication-modes]authentication types[/doc] for an example."
-<<<<<<< 
 msgstr "[doc@authentication-modes]인증 타입[/doc] 예제를 참조하세요."
 
 #: libraries/config/messages.inc.php:751