From baa50d76c19fab7c24cfc36e37ff8e963e47f19c Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Fri, 17 Dec 2021 23:09:09 -0500
Subject: [PATCH] Initial commit

---
 .../snippets/python-mode/intro-programming-hw.yasnippet   | 8 ++++++++
 install.sh                                                | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)
 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
diff --git a/install.sh b/install.sh
index c2a2949..47ca93e 100755
--- a/install.sh
+++ b/install.sh
@@ -25,10 +25,6 @@ cp -a $config_dir/dunst $backup/
 cp -a $config_dir/kitty $backup/
 cp -a $config_dir/nvim $backup/
 cp -a $config_dir/polybar $backup/
-<<<<<<< HEAD
-=======
-cp -a $config_dir/ranger $backup/
->>>>>>> 4f3a112 (Fix rebase conflicts)
 cp -a $bin_dir $backup/
 
 # Delete current files and folders
@@ -43,10 +39,6 @@ rm -rf $config_dir/dunst
 rm -rf $config_dir/kitty
 rm -rf $config_dir/nvim
 rm -rf $config_dir/polybar
-<<<<<<< HEAD
-=======
-rm -rf $config_dir/ranger/
->>>>>>> 4f3a112 (Fix rebase conflicts)
 rm -rf $bin_dir
 
 # Create HOME symlinks