tgrosinger/ohmyform
1
0
Fork 0
Code

merged

Browse Source
This commit is contained in:
David Baldwynn 2015-07-29 17:29:22 -07:00
commit c271052be3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/form.server.model.js
View File

@ -95,7 +95,11 @@ var FormSchema = new Schema({
},
font: String,
<<<<<<< HEAD
backgroundImage: { type: Schema.Types.Mixed }
=======
backgroundImage: type: Schema.Types.Mixed
>>>>>>> 33243bea2a1f74f8f417b240f5ad068c1d05c6bd
}
});