From ec603d3acbf3c9bfe809eae225bda9292d6ff351 Mon Sep 17 00:00:00 2001
From: Jet Hughes <jethughes0@gmail.com>
Date: Fri, 31 Mar 2023 12:31:12 +1300
Subject: [PATCH] vault backup: 2023-03-31 12:31:11

---
 content/Shopping.md                           | 20 +++++--------
 ...2.sync-conflict-20230331-121352-OX6NNIH.md | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 content/notes/cosc-342.sync-conflict-20230331-121352-OX6NNIH.md

diff --git a/content/Shopping.md b/content/Shopping.md
index c65156fe6..4342d6e06 100644
--- a/content/Shopping.md
+++ b/content/Shopping.md
@@ -1,14 +1,10 @@
-
-Daikon
-Sambal oelek
-Yeast
-Pork belly/loin
-Chilli's
-Cuc
-Coriander
-Hoisin
-
-
-
+Bread
+Peppercorns
+Tofu silken firm
+Ground beef
+Chilli
+Scallion
+Ginger
+Mirin
 
 
diff --git a/content/notes/cosc-342.sync-conflict-20230331-121352-OX6NNIH.md b/content/notes/cosc-342.sync-conflict-20230331-121352-OX6NNIH.md
new file mode 100644
index 000000000..042288f80
--- /dev/null
+++ b/content/notes/cosc-342.sync-conflict-20230331-121352-OX6NNIH.md
@@ -0,0 +1,29 @@
+---
+title: "cosc-342"
+year: 2023
+semester: 1
+tags: 
+- course
+- 
+---
+# Assignments
+
+# Labs
+
+- [x] [[01a-getting-started]]
+- [x] [[01b-cpp-essentials]]
+- [ ] [[02-image-transforms]]
+
+# Notes
+
+# Lectures
+- [x] [[01-intro-to-342]]
+- [x] [[02-colour-representation]]
+- [x] [[03-2d-transforms]]
+- [[04-mosaicing]]
+- [x] [[05-feature-description-and-matching]]
+- [x] [[06-homographies]]
+- [[08-visual-tracking-and-matching]]
+
+# Info
+