From ddf98b07ab76f655b5776f6a5476aa1e024922a4 Mon Sep 17 00:00:00 2001 From: Nathan C Date: Wed, 12 May 2021 16:22:58 -0400 Subject: [PATCH] housekeeping --- sonorancad/plugins/apicheck | 2 +- sonorancad/plugins/trafficstop | 2 +- tablet/html/index.html | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sonorancad/plugins/apicheck b/sonorancad/plugins/apicheck index cd16b04..de0fa81 160000 --- a/sonorancad/plugins/apicheck +++ b/sonorancad/plugins/apicheck @@ -1 +1 @@ -Subproject commit cd16b04638a213ec1200c0879fa91bdb004ff630 +Subproject commit de0fa81cf331c06eb1bf3251dfd09ef6f81ed557 diff --git a/sonorancad/plugins/trafficstop b/sonorancad/plugins/trafficstop index 8151afe..13a256e 160000 --- a/sonorancad/plugins/trafficstop +++ b/sonorancad/plugins/trafficstop @@ -1 +1 @@ -Subproject commit 8151afe697e6439871ce46001bcdaf5a93b3da10 +Subproject commit 13a256e2efe7e6b1d635e40d3098e781e54d00ba diff --git a/tablet/html/index.html b/tablet/html/index.html index 8d411f0..68943f6 100644 --- a/tablet/html/index.html +++ b/tablet/html/index.html @@ -8,15 +8,9 @@
-<<<<<<< HEAD -======= -
API ID not found! Please login into your Sonoran CAD account to get your API ID set.
- - ->>>>>>> b3314ad40f80d2878ce9b8a358d4a0486b848f2f