Fixing conflict in yui shim
Fixing conflict in yui shim

patrick-steele-idem/canjs,whitecolor/canjs,bitovi/canjs,gsmeets/canjs,Psykoral/canjs,rasjani/canjs,scorphus/canjs,mindscratch/canjs,azazel75/canjs,shiftplanning/canjs,whitecolor/canjs,rasjani/canjs,jebaird/canjs,ackl/canjs,patrick-steele-idem/canjs,beno/canjs,ackl/canjs,airhadoken/canjs,bitovi/canjs,WearyMonkey/canjs,whitecolor/canjs,Psykoral/canjs,bitovi/canjs,azazel75/canjs,rjgotten/canjs,janza/canjs,mindscratch/canjs,tracer99/canjs,schmod/canjs,janza/canjs,rasjani/canjs,dispatchrabbi/canjs,UXsree/canjs,shiftplanning/canjs,thomblake/canjs,sporto/canjs,dispatchrabbi/canjs,juristr/canjs,gsmeets/canjs,bitovi/canjs,WearyMonkey/canjs,scorphus/canjs,beno/canjs,cohuman/canjs,asavoy/canjs,airhadoken/canjs,sporto/canjs,tracer99/canjs,juristr/canjs,thomblake/canjs,thecountofzero/canjs,rjgotten/canjs,rasjani/canjs,Psykoral/canjs,jebaird/canjs,thecountofzero/canjs,jebaird/canjs,Psykoral/canjs,cohuman/canjs,yusufsafak/canjs,cohuman/canjs,schmod/canjs,yusufsafak/canjs,asavoy/canjs,patrick-steele-idem/canjs,sporto/canjs,tracer99/canjs,gsmeets/canjs,UXsree/canjs,schmod/canjs,beno/canjs,ackl/canjs,rjgotten/canjs,rjgotten/canjs,WearyMonkey/canjs