From 4d3eb5604cab8c2320ce119a467b4ca04b60c78a Mon Sep 17 00:00:00 2001
From: Stuart Thackray <stuart.thackray@gmail.com>
Date: Tue, 11 Dec 2018 09:22:15 +0200
Subject: Revert "add rebar.lock to template gitignore"

This reverts commit 8fb8a91130e0e5c239bb837b9adc4ad71e5806b8.
---
 priv/templates/gitignore | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'priv/templates')

diff --git a/priv/templates/gitignore b/priv/templates/gitignore
index 9d7e9c5..f1c4554 100644
--- a/priv/templates/gitignore
+++ b/priv/templates/gitignore
@@ -13,11 +13,7 @@ erl_crash.dump
 .rebar
 logs
 _build
-<<<<<<< HEAD
-rebar.lock
-=======
 .idea
 *.iml
 rebar3.crashdump
 *~
->>>>>>> upstream/master
-- 
cgit v1.1