Guest User

Untitled

a guest
May 27th, 2018
64
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.12 KB | None | 0 0
  1. Git diff:
  2. <<<<<<< HEAD:spec/models/user_spec.rb
  3. end
  4. =======
  5. end
  6. >>>>>>> 1.4:spec/models/user_spec.rb
  7. :P
Add Comment
Please, Sign In to add comment