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

# Conflicts: # .all-contributorsrc # README.md
docs: update .all-contributorsrc [skip ci]
2020-07-29 18:06:34 +03:00 · 2020-07-28 16:52:55 +00:00 · 2020-07-28 16:52:54 +00:00
2 changed files with 1 additions and 97 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -291,87 +291,6 @@
        "code"
      ]
    },
-    {
-      "login": "leonmak",
-      "name": "Leon Mak",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/13071508?v=4",
-      "profile": "http://leonmak.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "perwramdemark",
-      "name": "Per Wramdemark",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/7052193?v=4",
-      "profile": "http://www.wramdemark.se",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "waisuan",
-      "name": "Evan Sia Wai Suan",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/10975700?v=4",
-      "profile": "https://github.com/waisuan",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "AnaghaSasikumar",
-      "name": "AnaghaSasikumar",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/42939261?v=4",
-      "profile": "https://github.com/AnaghaSasikumar",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "christofferh",
-      "name": "Christoffer Hamberg",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/767643?v=4",
-      "profile": "https://christofferh.com",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "dgruntz",
-      "name": "Dominik Gruntz",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/1516800?v=4",
-      "profile": "https://github.com/dgruntz",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "hannespernpeintner",
-      "name": "Hannes",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/1679437?v=4",
-      "profile": "https://bitbucket.org/hannespernpeintner/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "leogtzr",
-      "name": "Leo Gutiérrez Ramírez",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/1211969?v=4",
-      "profile": "https://github.com/leogtzr",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "npczwh",
-      "name": "Zhang WH",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/14066422?v=4",
-      "profile": "https://github.com/npczwh",
-      "contributions": [
-        "code"
-      ]
-    },
    {
      "login": "oconnelc",
      "name": "Christopher O'Connell",
--- a/README.md
+++ b/README.md
@ -114,7 +114,7 @@ This project is licensed under the terms of the MIT license.
    <td align="center"><a href="https://github.com/gvsharma"><img src="https://avatars1.githubusercontent.com/u/6648152?v=4" width="100px;" alt=""/><br /><sub><b>GVSharma</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=gvsharma" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/SrdjanPaunovic"><img src="https://avatars1.githubusercontent.com/u/22815104?v=4" width="100px;" alt=""/><br /><sub><b>Srđan Paunović</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=SrdjanPaunovic" title="Code">💻</a></td>
    <td align="center"><a href="https://sideris.xyz/"><img src="https://avatars3.githubusercontent.com/u/5484694?v=4" width="100px;" alt=""/><br /><sub><b>Petros G. Sideris</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=sideris" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/npczwh"><img src="https://avatars0.githubusercontent.com/u/14066422?v=4" width="100px;" alt=""/><br /><sub><b>Zhang WH</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=npczwh" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/oconnelc"><img src="https://avatars0.githubusercontent.com/u/1112973?v=4" width="100px;" alt=""/><br /><sub><b>Christopher O'Connell</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=oconnelc" title="Code">💻</a></td>
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/qza"><img src="https://avatars3.githubusercontent.com/u/233149?v=4" width="100px;" alt=""/><br /><sub><b>qza</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=qza" title="Code">💻</a></td>
@ -144,21 +144,6 @@ This project is licensed under the terms of the MIT license.
    <td align="center"><a href="https://www.kevinpeters.net/about/"><img src="https://avatars1.githubusercontent.com/u/12736734?v=4" width="100px;" alt=""/><br /><sub><b>Kevin Peters</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=igeligel" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/hbothra15"><img src="https://avatars1.githubusercontent.com/u/7418012?v=4" width="100px;" alt=""/><br /><sub><b>Hemant Bothra</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=hbothra15" title="Code">💻</a></td>
    <td align="center"><a href="https://github.com/giorgosmav21"><img src="https://avatars2.githubusercontent.com/u/22855493?v=4" width="100px;" alt=""/><br /><sub><b>George Mavroeidis</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=giorgosmav21" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/oconnelc"><img src="https://avatars0.githubusercontent.com/u/1112973?v=4" width="100px;" alt=""/><br /><sub><b>Christopher O'Connell</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=oconnelc" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/leogtzr"><img src="https://avatars0.githubusercontent.com/u/1211969?v=4" width="100px;" alt=""/><br /><sub><b>Leo Gutiérrez Ramírez</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=leogtzr" title="Code">💻</a></td>
-    <td align="center"><a href="https://bitbucket.org/hannespernpeintner/"><img src="https://avatars3.githubusercontent.com/u/1679437?v=4" width="100px;" alt=""/><br /><sub><b>Hannes</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=hannespernpeintner" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/dgruntz"><img src="https://avatars0.githubusercontent.com/u/1516800?v=4" width="100px;" alt=""/><br /><sub><b>Dominik Gruntz</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=dgruntz" title="Code">💻</a></td>
-    <td align="center"><a href="https://christofferh.com"><img src="https://avatars1.githubusercontent.com/u/767643?v=4" width="100px;" alt=""/><br /><sub><b>Christoffer Hamberg</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=christofferh" title="Code">💻</a></td>
-  </tr>
-  <tr>
-    <td align="center"><a href="https://github.com/AnaghaSasikumar"><img src="https://avatars2.githubusercontent.com/u/42939261?v=4" width="100px;" alt=""/><br /><sub><b>AnaghaSasikumar</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=AnaghaSasikumar" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/waisuan"><img src="https://avatars2.githubusercontent.com/u/10975700?v=4" width="100px;" alt=""/><br /><sub><b>Evan Sia Wai Suan</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=waisuan" title="Code">💻</a></td>
-    <td align="center"><a href="http://www.wramdemark.se"><img src="https://avatars2.githubusercontent.com/u/7052193?v=4" width="100px;" alt=""/><br /><sub><b>Per Wramdemark</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=perwramdemark" title="Code">💻</a></td>
-    <td align="center"><a href="http://leonmak.me"><img src="https://avatars3.githubusercontent.com/u/13071508?v=4" width="100px;" alt=""/><br /><sub><b>Leon Mak</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=leonmak" title="Code">💻</a></td>
-  </tr>
-  <tr>
  </tr>
 </table>
Author	SHA1	Message	Date
Ilkka Seppälä	637cf61e40	Merge branch 'master' into all-contributors/add-oconnelc # Conflicts: # .all-contributorsrc # README.md	2020-07-29 18:06:34 +03:00
allcontributors[bot]	26a3be290b	docs: update .all-contributorsrc [skip ci]	2020-07-28 16:52:55 +00:00
allcontributors[bot]	f7846cefa9	docs: update README.md [skip ci]	2020-07-28 16:52:54 +00:00