Richard Alam 4db5c733ee - put a check in so that it won't check conflicts if there is none ... git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@1416 af16638f-c34d-0410-8cfa-b39d5352b314		2009-05-08 14:45:45 +00:00
..
controllers	- put a check in so that it won't check conflicts if there is none	2009-05-08 14:45:45 +00:00