From e45540b621cf266420f98c0d26ce60378aad4652 Mon Sep 17 00:00:00 2001
From: Jaron Kent-Dobias <jaron@kent-dobias.com>
Date: Thu, 27 Jul 2017 13:24:44 -0400
Subject: made some small merge changes

---
 .essential-ising.tex.swp | Bin 16384 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .essential-ising.tex.swp

(limited to '.essential-ising.tex.swp')

diff --git a/.essential-ising.tex.swp b/.essential-ising.tex.swp
deleted file mode 100644
index e091a93..0000000
Binary files a/.essential-ising.tex.swp and /dev/null differ
-- 
cgit v1.2.3-70-g09d2