Merge pull request #53380 from HaoZeke/updateConan

conan: 1.6.0 -> 1.11.2
2019-01-16 08:15:14 +00:00
parent 004b908ae6 efe4a6d205
commit fd5b4eeb19
2 changed files with 24 additions and 26 deletions
@@ -1759,6 +1759,11 @@
    email = "commits@schurr.at";
    github = "hansjoergschurr";
    name = "Hans-Jörg Schurr";
+    };
+  HaoZeke = {
+    email = "r95g10@gmail.com";
+    github = "haozeke";
+    name = "Rohit Goswami";
  };
  haslersn = {
    email = "haslersn@fius.informatik.uni-stuttgart.de";