aboutsummaryrefslogtreecommitdiff
path: root/deps/lightning/.gitattributes
diff options
context:
space:
mode:
authorPaul Cercueil2020-01-30 12:33:44 -0300
committerPaul Cercueil2020-02-08 11:44:52 -0300
commit4a71579b757d3a2eb6902c84391f429838ad4912 (patch)
treec57430315f1b82497eebd3fef24c0f4c0336bf0d /deps/lightning/.gitattributes
parentea884d3029c673e06a4084156ceb662598d8945a (diff)
downloadpcsx_rearmed-4a71579b757d3a2eb6902c84391f429838ad4912.tar.gz
pcsx_rearmed-4a71579b757d3a2eb6902c84391f429838ad4912.tar.bz2
pcsx_rearmed-4a71579b757d3a2eb6902c84391f429838ad4912.zip
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"
Diffstat (limited to 'deps/lightning/.gitattributes')
-rw-r--r--deps/lightning/.gitattributes1
1 files changed, 1 insertions, 0 deletions
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