Commit 6f903144 authored by ianzren's avatar ianzren

Corrected Merge

parent db694d7d
......@@ -23,17 +23,8 @@
<script src="button.js"></script>
</div>
<p id="demo">=a</p>
<p>Which ones you can't eat?</p>
<!-- <input id="Submit" type="submit" value="Submit"> -->
<button type="button" id="submit">Submit</button>
<script src="popup.js"></script>
<!-- <input id="userinput"></input> -->
<p>Please select the ingredients you'd like to avoid!</p>
<div class="content-active" id="custom">
Dairy : <input type="checkbox" id="Dairy"><br>
......@@ -41,10 +32,9 @@
Corn : <input type="checkbox" id="Corn"><br>
Gluten : <input type="checkbox" id="Gluten"><br>
<p>Which ones you can't eat?</p>
<button type="button" id="submit">Submit</button>
<input id="Submit" type="submit" value="Submit">
</div>
<script src="popup.js"></script>
<div class="content" id="load">
blah
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment