fix merge

Author: cboettig

content/create.html

@@ -5,21 +5,15 @@ const schema =  {
 	"media": {"type": "application/json;profile=http://schema.org/SoftwareSourceCode"},
 	"type": "object",
 	"properties": {
-<<<<<<< HEAD
     "@context": {"type": "string", "format": "uri", "default": "http://schema.org"},
     "@type": {"type": "string", "default": "SoftwareSourceCode"},
-=======
-    "@context": {"type": "string", "format": "uri"},
-    "@type": {"type": "string"},
->>>>>>> hugo
     "name": {"type": "string", "description": "Name of the software"},
     "codeRepository": {
 	    "type": "string",
 			"format": "uri"
 		},
 		"programmingLanguage": {"type": "string"},
 		"license": {"type": "string"},
-<<<<<<< HEAD
 	  "description": {"type": "string" },
 		"creator": {
 			"title": "Creator",
@@ -39,22 +33,3 @@ const schema =  {
 
 	}
 };
-
-=======
-		
-		"sameAs": {
-				"type": "string",
-				"format": "uri"
-		},
-		"url": {
-			"type": "string",
-			"format": "uri"
-	  },
-	  "description": {
-			"title": "Description",
-			"description": "A short description of the item.",
-			"type": "string"
-		}
-	}
-};
->>>>>>> hugo

static/schema.json

@@ -1,36 +1,8 @@
  const uiSchema= {
-<<<<<<< HEAD
-   
     "@type": {
       "ui:widget": "hidden"
     },
     "@context": {
       "ui:widget": "hidden"
     }
-=======
-    firstName: {
-      "ui:autofocus": true,
-      "ui:emptyValue": "",
-    },
-    age: {
-      "ui:widget": "updown",
-      "ui:title": "Age of person",
-      "ui:description": "(earthian year)",
-    },
-    bio: {
-      "ui:widget": "textarea",
-    },
-    password: {
-      "ui:widget": "password",
-      "ui:help": "Hint: Make it strong!",
-    },
-    date: {
-      "ui:widget": "alt-datetime",
-    },
-    telephone: {
-      "ui:options": {
-        inputType: "tel",
-      },
-    },
->>>>>>> hugo
   };