[Vtigercrm-commits] [vtiger development] #7136: Settings language file committed with errors

[vtiger development]

#7136: Settings language file committed with errors
-----------------------+----------------------------------------------------
 Reporter:  joebordes  |       Owner:  developer
     Type:  defect     |      Status:  new      
 Priority:  blocker    |   Milestone:  5.3.0    
Component:  vtigercrm  |     Version:  wip      
 Keywords:  i18n       |  
-----------------------+----------------------------------------------------
 The file modules/Settings/language/en_us.lang.php has patch conflict lines
 included around line 850 in revision 13455

-- 
Ticket URL: <http://trac.vtiger.com/cgi-bin/trac.cgi/ticket/7136>
vtiger development <http://trac.vtiger.com/>
vtigerCRM