From 99544ac6a8c4b7b89f532c1893a69c4ce38b76b1 Mon Sep 17 00:00:00 2001
From: Eric McCormick <edm00se@users.noreply.github.com>
Date: Fri, 10 Jan 2020 16:41:01 -0600
Subject: [PATCH 1/3] adds @edm00se

it me
---
 src/data.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/data.js b/src/data.js
index 7e676ff6..017cc106 100644
--- a/src/data.js
+++ b/src/data.js
@@ -2064,6 +2064,28 @@ const pages = [
       'YouTuber',
     ],
   },
+  {
+    name: 'Eric McCormick',
+    description:
+      'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
+    url: 'https://edm00se.codes/uses/',
+    twitter: '@edm00se',
+    emoji: '🤔',
+    country: '🇺🇸',
+    computer: 'apple',
+    phone: 'iphone',
+    tags: [
+      'Developer',
+      'Full Stack',
+      'Blogger',
+      'Speaker',
+      'YouTuber',
+      'JavaScript',
+      'Vue',
+      'Node',
+      'CSS'
+    ],
+  },
 ];
 
 export default pages;

From 2b1f09995edfa062e02407f8967abac2e3659d05 Mon Sep 17 00:00:00 2001
From: Eric McCormick <edm00se@users.noreply.github.com>
Date: Mon, 13 Jan 2020 08:39:01 -0600
Subject: [PATCH 2/3] fix validation error after merging

good ol' conflict handling
---
 src/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data.js b/src/data.js
index d068a0d1..1b28c49b 100644
--- a/src/data.js
+++ b/src/data.js
@@ -2053,7 +2053,7 @@ const pages = [
       'Vue',
       'Node',
       'CSS'
-  },
+  }
 ];
 
 export default pages;

From ce522c2c2e7aad855c45c86c09da7e32c6aa1b72 Mon Sep 17 00:00:00 2001
From: Eric McCormick <edm00se@gmail.com>
Date: Mon, 13 Jan 2020 08:41:48 -0600
Subject: [PATCH 3/3] fix the fix

derp
---
 src/data.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/data.js b/src/data.js
index 1b28c49b..234e3365 100644
--- a/src/data.js
+++ b/src/data.js
@@ -2035,8 +2035,7 @@ const pages = [
   },
   {
     name: 'Eric McCormick',
-    description:
-      'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
+    description: 'Software Developer, IBM Champion, coffee lover, dabbler in all things technology, hobbyist 3d design and printing',
     url: 'https://edm00se.codes/uses/',
     twitter: '@edm00se',
     emoji: '🤔',
@@ -2052,8 +2051,9 @@ const pages = [
       'JavaScript',
       'Vue',
       'Node',
-      'CSS'
-  }
+      'CSS',
+    ]
+  },
 ];
 
 export default pages;