marijnh/CodeMirror — pull request #1965 by WPG (2013-11-19 06:56:41+00:00)
Title: Update fullscreen.js

Solve the problem of conflict with 'merge'.