Removed merge conflict tags from Detector
1 parent ca9f0bf commit 510a36a2b2a91f8bffecf0723e8c5fe0b75e33e5
@Elliott Dicus Elliott Dicus authored on 20 Mar 2013
Showing 1 changed file
View
src/pixi/utils/Detector.js