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

# Conflicts: # .all-contributorsrc # README.md
docs: update .all-contributorsrc [skip ci]
2020-07-29 19:13:55 +03:00 · 2020-07-28 17:04:51 +00:00 · 2020-07-28 17:04:50 +00:00
2 changed files with 0 additions and 10 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -291,15 +291,6 @@
        "code"
      ]
    },
-    {
-      "login": "7agustibm",
-      "name": "Agustí Becerra Milà",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/8149332?v=4",
-      "profile": "https://github.com/7agustibm",
-      "contributions": [
-        "code"
-      ]
-    },
    {
      "login": "Juaanma",
      "name": "Juan Manuel Suárez",
--- a/README.md
+++ b/README.md
@@ -184,7 +184,6 @@ This project is licensed under the terms of the MIT license.
  </tr>
  <tr>
    <td align="center"><a href="https://github.com/Juaanma"><img src="https://avatars3.githubusercontent.com/u/7390500?v=4" width="100px;" alt=""/><br /><sub><b>Juan Manuel Suárez</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=Juaanma" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/7agustibm"><img src="https://avatars0.githubusercontent.com/u/8149332?v=4" width="100px;" alt=""/><br /><sub><b>Agustí Becerra Milà</b></sub></a><br /><a href="https://github.com/iluwatar/java-design-patterns/commits?author=7agustibm" title="Code">💻</a></td>
  </tr>
  <tr>
  </tr>
Author	SHA1	Message	Date
Ilkka Seppälä	726991739b	Merge branch 'master' into all-contributors/add-Juaanma # Conflicts: # .all-contributorsrc # README.md	2020-07-29 19:13:55 +03:00
allcontributors[bot]	84f0ba8b08	docs: update .all-contributorsrc [skip ci]	2020-07-28 17:04:51 +00:00
allcontributors[bot]	44c36500c0	docs: update README.md [skip ci]	2020-07-28 17:04:50 +00:00