Fix merge conflicts with test values

2014-12-26 16:00:45 -05:00
parent 8852ad61b2 03f12a3718
commit 2de3e65043
1 changed files with 1 additions and 1 deletions
@@ -279,7 +279,7 @@ var UserSchema = new Schema({
    allocationMode: {type:String, enum: ['flat','classbased','taskbased'], 'default': 'flat'},
    costume: Boolean,
    dateFormat: {type: String, enum:['MM/dd/yyyy', 'dd/MM/yyyy'], 'default': 'MM/dd/yyyy'},
-    sleep: {type: Boolean, 'default': false},
+	sleep: {type: Boolean, 'default': false},
    stickyHeader: {type: Boolean, 'default': true},
    disableClasses: {type: Boolean, 'default': false},
    newTaskEdit: {type: Boolean, 'default': false},