⚡

xrr2016 · xrr2016 · commit ef42b61068e0 · 2016-12-23T23:25:04.000+08:00
diff --git a/15 - LocalStorage/index-FINISHED.html b/15 - LocalStorage/index-FINISHED.html
@@ -51,9 +51,15 @@ <h2>LOCAL TAPAS</h2>
     }
     const plate = document.createElement('li')
     plate.innerHTML = `
+<<<<<<< HEAD
       <input type="checkbox" data-index="${plates.length - 1}" id="item${plates.length - 1}" ${plates[plates.length - 1].done ? 'checked' : "" }></input>
       <label for="item${plates.length - 1}" >${plates[plates.length - 1].text}</label>
     `
+=======
+       <input type="checkbox" data-index="${plates.length - 1}" id="item${plates.length - 1}" ${plates[plates.length - 1].done ? 'checked' : "" }></input>
+       <label for="item${plates.length - 1}" >${plates[plates.length - 1].text}</label>
+     `
+>>>>>>> 59d6cedbf2d3b40f379552437616534efaccde5b
     platesList.appendChild(plate)
   }
 

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,15 @@ <h2>LOCAL TAPAS</h2>`
`51`	`51`	`}`
`52`	`52`	`const plate = document.createElement('li')`
`53`	`53`	plate.innerHTML = `
	`54`	`+<<<<<<< HEAD`
`54`	`55`	`<input type="checkbox" data-index="${plates.length - 1}" id="item${plates.length - 1}" ${plates[plates.length - 1].done ? 'checked' : "" }></input>`
`55`	`56`	`<label for="item${plates.length - 1}" >${plates[plates.length - 1].text}</label>`
`56`	`57`	`
	`58`	`+=======`
	`59`	`+ <input type="checkbox" data-index="${plates.length - 1}" id="item${plates.length - 1}" ${plates[plates.length - 1].done ? 'checked' : "" }></input>`
	`60`	`+ <label for="item${plates.length - 1}" >${plates[plates.length - 1].text}</label>`
	`61`	+ `
	`62`	`+>>>>>>> 59d6cedbf2d3b40f379552437616534efaccde5b`
`57`	`63`	`platesList.appendChild(plate)`
`58`	`64`	`}`
`59`	`65`