shazahm1/Connections — pull request #163 by nbrock (2013-04-30 08:35:02+00:00)
Title: Merge conflict markers left in.

Latest update to Connections (Version 0.7.6.5 ) causes a 500 error. This has been caused by the merge conflict markers left in the class.settings.php file, line 417. This pull request clears out those markers and ensures that connections loads as per usual.