housekeeping

Sonoran-Software · May 12, 2021 · ddf98b0 · ddf98b0
1 parent 6d59bbd
commit ddf98b0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/sonorancad/plugins/apicheck b/sonorancad/plugins/apicheck
diff --git a/sonorancad/plugins/trafficstop b/sonorancad/plugins/trafficstop
diff --git a/tablet/html/index.html b/tablet/html/index.html
@@ -8,15 +8,9 @@
     <body style="display:none;">
         <div id="tablet">
             <div class="content">
-<<<<<<< HEAD
 				<div id="check-api-data" style="display:none">API ID not found! Please login into your Sonoran CAD account to get your API ID set. - <button id="retryapi" name="retryapi" value="Retry" onclick="runApiCheck()">Retry</button></div>
                 <!-- Edit the src field below with your custom link, if used. You can also resize the tablet frame.-->
                 <iframe id="mdtFrame" src="https://sonorancad.com/#/" width="1100" height="510"></iframe>
-=======
-				<div id="check-api-data">API ID not found! Please login into your Sonoran CAD account to get your API ID set.</div>
-                <!-- Edit the src field below with your custom link, if used. You can also resize the tablet frame.-->
-                <iframe id="mdtFrame" src="https://app.sonorancad.com/#/" width="1100" height="510"></iframe>
->>>>>>> b3314ad40f80d2878ce9b8a358d4a0486b848f2f
             </div>
         </div>
         <script src="config.js" type="text/javascript"></script>
+10 −6		apicheck/sv_apicheck.lua
+1 −1		apicheck/version_apicheck.json
+1 −1		trafficstop/sv_trafficstop.lua
+4 −2		trafficstop/version_trafficstop.json