From 9d35a4b589e1492b3e61c7c56c8337d7b9096846 Mon Sep 17 00:00:00 2001 From: Dennis Sauve Date: Sun, 23 Jul 2023 19:35:57 -0700 Subject: [PATCH 1/3] =?UTF-8?q?Add=20Dennis=20Sauv=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data.js | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/data.js b/src/data.js index b262fc57..1cd7a9dd 100644 --- a/src/data.js +++ b/src/data.js @@ -21,6 +21,31 @@ * Keep this a commonjs export. */ module.exports = [ + { + name: 'Dennis Sauvé', + description: 'DevOps Engineer w/Dev roots in the Pacific North West!', + url: 'https://gist.github.com/dengsauve/e344ef7d8bd0d194b602e8b2d4490f98', + twitter: '@dengsauve', + emoji: '🖖', + country: '🇺🇸', + computer: 'apple', + phone: 'iphone', + tags: [ + 'Azure', + 'Developer', + 'DevOps', + 'FinTech', + 'GitHub', + 'Laravel', + 'PHP', + 'Pulumi', + 'Rails', + 'Remote', + 'Ruby', + 'Tailwind CSS', + 'TypeScript', + ], + }, { name: 'Daniel Flanagan', description: 'Developer, platform engineer, and homelab administrator', From f99740a4b4005bc5645ca3e889202c485bf23171 Mon Sep 17 00:00:00 2001 From: Blake Campbell Date: Fri, 4 Aug 2023 09:46:29 -0400 Subject: [PATCH 2/3] Fixing spacing --- src/data.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/data.js b/src/data.js index f131f8d3..6d7a27a4 100644 --- a/src/data.js +++ b/src/data.js @@ -22,7 +22,6 @@ */ module.exports = [ { - name: 'Dennis Sauvé', description: 'DevOps Engineer w/Dev roots in the Pacific North West!', url: 'https://gist.github.com/dengsauve/e344ef7d8bd0d194b602e8b2d4490f98', @@ -45,9 +44,8 @@ module.exports = [ 'Ruby', 'Tailwind CSS', ] -}, + }, { - name: 'Jana', description: 'Full Stack Developer & Javascript Enthusiast', url: 'https://janasundar.dev/uses', From a16e7ddf2353c26d549ce035b4cde318541bbe92 Mon Sep 17 00:00:00 2001 From: Blake Campbell Date: Fri, 4 Aug 2023 09:47:03 -0400 Subject: [PATCH 3/3] Fixing merge conflict empty line --- src/data.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data.js b/src/data.js index 6d7a27a4..612f201e 100644 --- a/src/data.js +++ b/src/data.js @@ -61,7 +61,6 @@ module.exports = [ 'Designer', 'Next.js', 'JavaScript', - 'TypeScript', ], },