Rebase conflicts resolve

This commit is contained in:
Andrew Scott 2021-12-17 23:19:27 -05:00
parent 9580a0c5f9
commit 54020d25c4
Signed by: a
GPG key ID: 3EB62D0BBB8DB381

View file

@ -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