self merge

This commit is contained in:
PaulaBras
2022-11-08 19:01:30 +01:00
5 changed files with 1601 additions and 1806 deletions

View File

@ -17,12 +17,16 @@
<input type="text" id="dirBox" name="name" size="80" readonly>
<progress id="progressbar" max="100" value="0"></progress>
<<<<<<< HEAD
<button id="update">Check for update</button>
<select name="Dropme Down" id="gng"></select>
<button id="getFiles">Get Files</button>
<select name="Dropme Down #2" id="files"></select>
=======
<button id="git">Do Git Operations</button>
>>>>>>> 2a8f20c2d57676c3963cd61f7bbc3740a707c725
<script src="./renderer.js"></script>
</body>