From 4a71579b757d3a2eb6902c84391f429838ad4912 Mon Sep 17 00:00:00 2001
From: Paul Cercueil
Date: Thu, 30 Jan 2020 12:33:44 -0300
Subject: git subrepo clone https://git.savannah.gnu.org/git/lightning.git
 deps/lightning

subrepo:
  subdir:   "deps/lightning"
  merged:   "b0b8eb5"
upstream:
  origin:   "https://git.savannah.gnu.org/git/lightning.git"
  branch:   "master"
  commit:   "b0b8eb5"
git-subrepo:
  version:  "0.4.1"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "a04d8c2"
---
 deps/lightning/.gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 deps/lightning/.gitattributes

(limited to 'deps/lightning/.gitattributes')

diff --git a/deps/lightning/.gitattributes b/deps/lightning/.gitattributes
new file mode 100644
index 0000000..e8495d5
--- /dev/null
+++ b/deps/lightning/.gitattributes
@@ -0,0 +1 @@
+ChangeLog merge=merge-changelog
-- 
cgit v1.2.3