Merge pull request #4365 from Montellese/settinglist_minmax_conflict
authorjmarshallnz <jcmarsha@gmail.com>
Fri, 7 Mar 2014 20:50:12 +0000 (09:50 +1300)
committerjmarshallnz <jcmarsha@gmail.com>
Fri, 7 Mar 2014 20:50:12 +0000 (09:50 +1300)
settings: fix conflict of <minimum> and <maximum> for CSettingList

1  2 
system/settings/settings.xml

Simple merge