From 96bc55b90d071bab5f8295eab5c686eb70e7d233 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Fri, 17 Dec 2021 23:19:27 -0500
Subject: [PATCH] Rebase conflicts resolve

---
 .../snippets/python-mode/intro-programming-hw.yasnippet   | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 emacs.d/snippets/python-mode/intro-programming-hw.yasnippet

diff --git a/emacs.d/snippets/python-mode/intro-programming-hw.yasnippet b/emacs.d/snippets/python-mode/intro-programming-hw.yasnippet
new file mode 100644
index 0000000..36e5c58
--- /dev/null
+++ b/emacs.d/snippets/python-mode/intro-programming-hw.yasnippet
@@ -0,0 +1,8 @@
+# -*- mode: snippet -*-
+# key : 161
+# group: school
+# name : cs hw header
+# --
+# Author: $1
+# Date: `(format-time-string "%m-%d-%Y")`$0
+# Description: $2