From 9489a9447396b30bca86ea3df201cacfdffdb1a9 Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Sat, 8 Dec 2018 16:54:54 +1100
Subject: Make merge panel its own panel

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index e87f09a89..42ef840fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,4 +23,6 @@ lazygit
 !.gitignore
 !.goreleaser.yml
 !.circleci/
-!.github/
\ No newline at end of file
+!.github/
+
+test/git_server/data
\ No newline at end of file
-- 
cgit v1.2.3