bad Merge from development to master - Githubissues

goFrendiAsgard / No-CMS

No-CMS, A CodeIgniter Based CMS Framework

300 stars 199 forks source link

bad Merge from development to master #167

Closed noogen closed 7 years ago

noogen commented 7 years ago

Example: https://github.com/goFrendiAsgard/No-CMS/blob/master/index.php

Line: 611, 903, etc...

goFrendiAsgard commented 7 years ago

Fixed