Commit 37e8022e authored by Tim Häuser's avatar Tim Häuser

fixed conflict

parent 73be1b62
......@@ -160,11 +160,7 @@ Ext.define("ARSnova.controller.Auth", {
var animation = {
type: 'flip',
<<<<<<< HEAD
direction: role ? 'right' : left,
=======
direction: role ? 'right' : 'left',
>>>>>>> d199d92ff38ee74b2f549bbfa47038b0aaaf3694
listeners: !callback ? {} : {
animationend: callback
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment