gistfile1.txt

diff --cc Bugzilla/Auth/Verify.pm
index 2e49175d7,639760c2b..000000000
--- a/Bugzilla/Auth/Verify.pm
+++ b/Bugzilla/Auth/Verify.pm
@@@ -86,8 -86,10 +86,20 @@@ sub create_or_update_user 

        # XXX Theoretically this could fail with an error, but the fix for
        # that is too involved to be done right now.
++<<<<<<< HEAD
 +      my $user = Bugzilla::User->create(
 +        {login_name => $username, cryptpassword => $password, realname => $real_name});
++||||||| 3395d78cc
++            my $user = Bugzilla::User->create({ 
++                login_name    => $username, 
++                cryptpassword => $password,
++                realname      => $real_name});
++=======
+       my $user
+         = Bugzilla::User->create({
+         login_name => $username, cryptpassword => $password, realname => $real_name
+         });
++>>>>>>> 7f3a749d7bd78a3e4aee163f562d7e95b0954b44
        $username_user_id = $user->id;
      }