R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Adam Bem
2023-05-30 15:49:50 +02:00
parent e9221e2393
commit 5a331d9815
7 changed files with 0 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Frontend/tools/mock.html
View File

@@ -42,35 +42,6 @@
<div class="tool-context">
<div>
<h1>MockedServices</h1>
<<<<<<< HEAD:Backend/mocked-services/src/main/resources/static/html/mock.html
</div>
<div>
<label for="uuid-input" class="block-display">UUID</label>
<div id="uuid-edit">
<div id="uuid-edit-field" class="bordered-field disabled">
<input id="uuid-input" disabled onfocusout="changeUUID(this);" value="UUID" />
<button onclick="copyUUIDToClipboard();" class="uuid-inputField-icon modification-button flex-item btn-copy action-button">
<span class="material-icons uuid-inputField-icon-span ">content_copy</span>
</button>
</div>
<div id="editableBlock">
<input type="checkbox" onchange="changeEditionOfUUID(this)" name="editable" id="editable" value="false"/>
<label for="editable">Editable</label>
</div>
</div>
<div class="hiddable" id="uuid-validation-strategy">
<label><b>UUID generation strategy:</b></label>
<input type="radio" checked name="uuid-validation-type" value="new" id="generateNew"/>
<label for="generateNew">Generate new UUID</label>
<input type="radio" name="uuid-validation-type" value="restore" id="restore"/>
<label for="restore">Restore previous UUID</label>
</div>
=======
>>>>>>> master:Frontend/tools/mock.html
</div>
<div>
<!-- h2 -->
@@ -254,13 +225,7 @@
</div>
<div class="body">You haven't saved your message!<br> Do you want to save it?</div>
<div class="function">
<<<<<<< HEAD:Backend/mocked-services/src/main/resources/static/html/mock.html
<button type = "button" onclick = "updateData()" value = "Display">Save</button>
=======
<button type = "button" onclick = "updateData()" value = "Display">Save</button>
>>>>>>> master:Frontend/tools/mock.html
<button>No</button>
</div>
</div>