summaryrefslogtreecommitdiff
path: root/data/_nghttp2/_metadata/conflicts
diff options
context:
space:
mode:
Diffstat (limited to 'data/_nghttp2/_metadata/conflicts')
-rw-r--r--data/_nghttp2/_metadata/conflicts1
1 files changed, 1 insertions, 0 deletions
diff --git a/data/_nghttp2/_metadata/conflicts b/data/_nghttp2/_metadata/conflicts
new file mode 100644
index 000000000..b67b7d0b5
--- /dev/null
+++ b/data/_nghttp2/_metadata/conflicts
@@ -0,0 +1 @@
+nghttp2