aces/Loris — pull request #733 by driusan (2014-10-23 17:00:57+00:00)
Title: Ran conflict detector class through PHPCS

This cleans up yet another class to meet the Loris coding standards