From b95dd8fab5301c2513b718b0e7d35481092718b1 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 5 Jan 2019 17:35:41 -0500
Subject: [PATCH] Add a dummy file to ensure that branch autolayout can be
 --no-ff merged with master.

---
 dummy | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 dummy

diff --git a/dummy b/dummy
new file mode 100644
index 00000000..421376db
--- /dev/null
+++ b/dummy
@@ -0,0 +1 @@
+dummy