fixed merge conflicts

This commit is contained in:
Queen Bee
2018-01-19 08:30:50 -08:00
3 changed files with 29 additions and 7 deletions

View File

@@ -11,9 +11,9 @@
<div class="container window align-content-center">
<h1>DocumentIt</h1>
<form>
<input type="text" name="casename" placeholder="Case Name"><br>
<input type="text" name="socialmedia" placeholder="Social Media"><br>
<textarea name="description" placeholder="Incident Description..." rows="10" cols="30"></textarea>
<input type="text" id="casename" name="casename" placeholder="Case Name"><br>
<input type="text" id="socialmedia" name="socialmedia" placeholder="Social Media"><br>
<textarea id="description" name="description" placeholder="Incident Description..." rows="10" cols="30"></textarea>
</form>
<label id="screenshot-path">Path:</label><br>