From 01538d46bac4d2607ad01d04548085f6918ba4d0 Mon Sep 17 00:00:00 2001
From: Michael Allen <michael@michaelallen.io>
Date: Tue, 17 Feb 2015 21:09:21 +0000
Subject: add functions for conflicted changes

---
 bar | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 bar

(limited to 'bar')

diff --git a/bar b/bar
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3