summaryrefslogtreecommitdiff
path: root/data/libnghttp2-dev/_metadata/conflicts
diff options
context:
space:
mode:
authorSam Bingner <sam@bingner.com>2019-05-31 00:03:54 -1000
committerSam Bingner <sam@bingner.com>2019-05-31 00:03:54 -1000
commit9c64d929e61153cd05fef8eb1e61d3ad2b2f46c1 (patch)
tree2c52039a3849784d3cf3d3ecd284c675d9b1e695 /data/libnghttp2-dev/_metadata/conflicts
parentf501927d7eaf972d525a608fde14570ca06d5279 (diff)
Updates for node.js and libnghttp2
Diffstat (limited to 'data/libnghttp2-dev/_metadata/conflicts')
-rw-r--r--data/libnghttp2-dev/_metadata/conflicts1
1 files changed, 1 insertions, 0 deletions
diff --git a/data/libnghttp2-dev/_metadata/conflicts b/data/libnghttp2-dev/_metadata/conflicts
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/libnghttp2-dev/_metadata/conflicts
@@ -0,0 +1 @@
+nghttp2