From 3e0738bc525af719ff7cb3c4376fa8240657e2be Mon Sep 17 00:00:00 2001 From: Christoph Kappestein Date: Thu, 25 Aug 2016 22:54:36 +0200 Subject: [PATCH 1/2] add fusio --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d17c7609..3c9ab8d4 100644 --- a/README.md +++ b/README.md @@ -638,6 +638,7 @@ See also , Date: Sat, 27 Aug 2016 07:34:36 -0700 Subject: [PATCH 2/2] resolve conflict --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8575617c..33e0849d 100644 --- a/README.md +++ b/README.md @@ -639,6 +639,7 @@ See also ,