From: Michael D. Lowis <mike@mdlowis.com>
Date: Tue, 16 Jun 2020 00:57:12 +0000 (-0400)
Subject: merge conflicts
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=da606ad31375b03332aaf52f1dc9108c5d02a16c;p=projs%2Fawiki.git

merge conflicts
---

da606ad31375b03332aaf52f1dc9108c5d02a16c
diff --cc pages/20200609230839.md
index b1f53e2,30c4276..6e01a8c
--- a/pages/20200609230839.md
+++ b/pages/20200609230839.md
@@@ -1,5 -1,5 +1,4 @@@
  @tags todo
--
  # Todo List
  
  ## Now
@@@ -16,8 -14,9 +13,9 @@@
  * broken builds
  
  ## Soon
 +* review write-up
 +* Get a dongle and DiVa setup
+ * Look over ASPICE docs
 -* Allen's review write-up
 -* Get a dongle and DiVa setup for Randy
  
  ## Later
  * Asciidoc documentation for CVP
@@@ -25,5 -24,6 +23,6 @@@
  
  ## Follow-Up
  * Corporate Gen 2 Backlight issue on startup
 -* AR0233 Development (Will)
 +* AR0233 Development
+ * Raspberry Pi integration rig