codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-14 07:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflict.

Browse source
This commit is contained in:
Scott Erickson 2014-08-26 15:42:03 -07:00
parent 5d804c6d9a
commit f1bf160755
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/schemas/models/user.coffee
View file

@ -45,12 +45,7 @@ visa = c.shortString
title: 'US Work Status'
description: 'Are you authorized to work in the US, or do you need visa sponsorship? (If you live in Canada or Australia, mark authorized.)'
enum: ['Authorized to work in the US', 'Need visa sponsorship']
<<<<<<< HEAD
=======
default: 'Authorized to work in the US'
>>>>>>> master
_.extend UserSchema.properties,
email: c.shortString({title: 'Email', format: 'email'})
firstName: c.shortString({title: 'First Name'})