Merge branch 'master' into all-contributors/add-dzmitryh

# Conflicts: # .all-contributorsrc # README.md
docs: update .all-contributorsrc [skip ci]
2020-07-29 19:34:26 +03:00 · 2020-07-28 17:09:51 +00:00 · 2020-07-28 17:09:50 +00:00
2 changed files with 0 additions and 10 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -291,15 +291,6 @@
        "code"
      ]
    },
-    {
-      "login": "christophercolumbusdog",
-      "name": "Christian Cygnus",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/9342724?v=4",
-      "profile": "http://ccygnus.com/",
-      "contributions": [
-        "code"
-      ]
-    },
    {
      "login": "dzmitryh",
      "name": "Dima Gubin",
--- a/README.md
+++ b/README.md
@ -202,7 +202,6 @@ This project is licensed under the terms of the MIT license.
  </tr>
  <tr>
    <td align="center"><a href="https://about.me/dzmitryh"><img src="https://avatars2.githubusercontent.com/u/5390492?v=4" width="100px;" alt=""/><br /><sub><b>Dima Gubin</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=dzmitryh" title="Code">💻</a></td>
-    <td align="center"><a href="http://ccygnus.com/"><img src="https://avatars1.githubusercontent.com/u/9342724?v=4" width="100px;" alt=""/><br /><sub><b>Christian Cygnus</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=christophercolumbusdog" title="Code">💻</a></td>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	8bac0b44cf	Merge branch 'master' into all-contributors/add-dzmitryh # Conflicts: # .all-contributorsrc # README.md	2020-07-29 19:34:26 +03:00
allcontributors[bot]	6986a4c76d	docs: update .all-contributorsrc [skip ci]	2020-07-28 17:09:51 +00:00
allcontributors[bot]	ff4c237963	docs: update README.md [skip ci]	2020-07-28 17:09:50 +00:00