your local changes to the following files would be overwritten by merge: application/config/config.php please commit your changes or stash them before you merge. aborting
Register to vote on and add code examples. Join our developer community to improve your dev skills and code like a boss!
No Good?
Help us improve our code examples by registering to vote on and add answers. Join our developer community to improve your dev skills and code like a boss!