Add files via upload

ThatRed · Sep 22, 2024 · e717b0e · e717b0e
1 parent 37af79f
commit e717b0e
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/data/misc.html b/data/misc.html
@@ -86,18 +86,12 @@ <h2 style="text-align: center;">Device Configuration</h2>
   <input type='hidden' name='gpio-a-unlock' value='0'>
   <input type="checkbox" name="gpio-a-unlock" id="gpio-a-unlock" value="1">
 
-<<<<<<< Updated upstream
-  <label for="gpio-a-pin">GPIO Input Pin</label>
-  <input type="number" name="gpio-in-pin" id="gpio-in-pin" placeholder="25" required value="%GPIOINPIN%">
-
-=======
   <label for="gpio-in-pin">GPIO Input Pin</label>
   <input type="number" name="gpio-in-pin" id="gpio-in-pin" placeholder="25" required value="%GPIOINPIN%">
 
   <label for="gpio-buz-pin">GPIO Buzzer Pin</label>
   <input type="number" name="gpio-buz-pin" id="gpio-buz-pin" placeholder="17" required value="%GPIOBUZPIN%">
 
->>>>>>> Stashed changes
   <div style="display: flex;justify-content: space-around;margin-top: 1rem;">
     <button type="submit" style="cursor: pointer;padding-inline: 1rem;padding-block: .5rem;">Submit</button>
     <button type="reset" style="cursor: pointer;padding-inline: 1rem;padding-block: .5rem;">Reset</button>