From 2d42b41ad5d06009a1f722f4654f4dd85a3fe5d2 Mon Sep 17 00:00:00 2001
From: David Akim <davidjohnakim@hotmail.com>
Date: Thu, 3 Oct 2024 20:39:41 -0400
Subject: [PATCH] Fixed merged conflicts

---
 app/_generatedData/buildUrls.json         |   1 +
 netlify/functions/data-members/core.ts    |   4 +
 netlify/functions/data-members/members.ts | 176 ++++++++++++++++++++++
 3 files changed, 181 insertions(+)
 create mode 100644 app/_generatedData/buildUrls.json
 create mode 100644 netlify/functions/data-members/core.ts
 create mode 100644 netlify/functions/data-members/members.ts

diff --git a/app/_generatedData/buildUrls.json b/app/_generatedData/buildUrls.json
new file mode 100644
index 00000000..951e800d
--- /dev/null
+++ b/app/_generatedData/buildUrls.json
@@ -0,0 +1 @@
+{"URL":"http://localhost:9000"}
\ No newline at end of file
diff --git a/netlify/functions/data-members/core.ts b/netlify/functions/data-members/core.ts
new file mode 100644
index 00000000..a2af0148
--- /dev/null
+++ b/netlify/functions/data-members/core.ts
@@ -0,0 +1,4 @@
+export * from '../../../members/core/bekahhw';
+export * from '../../../members/core/danieltott';
+export * from '../../../members/core/juliaseid';
+export * from '../../../members/core/tkshill';
\ No newline at end of file
diff --git a/netlify/functions/data-members/members.ts b/netlify/functions/data-members/members.ts
new file mode 100644
index 00000000..c6ad2afb
--- /dev/null
+++ b/netlify/functions/data-members/members.ts
@@ -0,0 +1,176 @@
+export * from '../../../members/members/abbeyperini';
+export * from '../../../members/members/abuna1985';
+export * from '../../../members/members/adiati98';
+export * from '../../../members/members/AisheIbrahim';
+export * from '../../../members/members/aishwaryamali';
+export * from '../../../members/members/ajoseaishat';
+export * from '../../../members/members/AlexCovone';
+export * from '../../../members/members/AlexVCS';
+export * from '../../../members/members/aliaquintero';
+export * from '../../../members/members/alvarosanchez';
+export * from '../../../members/members/AmyShackles';
+export * from '../../../members/members/andreamartz';
+export * from '../../../members/members/annakimdev';
+export * from '../../../members/members/anshumanSathua';
+export * from '../../../members/members/ARodriguezHacks';
+export * from '../../../members/members/Arol15';
+export * from '../../../members/members/arvinf07';
+export * from '../../../members/members/aureliefomum';
+export * from '../../../members/members/aurelieverrot';
+export * from '../../../members/members/avinashupadhya99';
+export * from '../../../members/members/awildstone';
+export * from '../../../members/members/barbaralaw';
+export * from '../../../members/members/bjorkypie';
+export * from '../../../members/members/bmeverett';
+export * from '../../../members/members/BogDAAAMN';
+export * from '../../../members/members/brandonbrown4792';
+export * from '../../../members/members/BrennaKH';
+export * from '../../../members/members/c0der4t';
+export * from '../../../members/members/cafloyd';
+export * from '../../../members/members/calendee';
+export * from '../../../members/members/carmenkolohe';
+export * from '../../../members/members/carrollsa';
+export * from '../../../members/members/CassidyMountjoy';
+export * from '../../../members/members/cassiel257';
+export * from '../../../members/members/CBID2';
+export * from '../../../members/members/Cerchie';
+export * from '../../../members/members/ChadStewart';
+export * from '../../../members/members/chaos986';
+export * from '../../../members/members/chelseaerinavery';
+export * from '../../../members/members/chrisjin';
+export * from '../../../members/members/chrismjohnston';
+export * from '../../../members/members/christinaLoiacono';
+export * from '../../../members/members/clandau';
+export * from '../../../members/members/ClJarvis';
+export * from '../../../members/members/codewithjazzy';
+export * from '../../../members/members/CodingatTiffanys';
+export * from '../../../members/members/crisbnp';
+export * from '../../../members/members/crislanarafael';
+export * from '../../../members/members/CuriousCurmudgeon';
+export * from '../../../members/members/dakim';
+export * from '../../../members/members/damonholden';
+export * from '../../../members/members/Dana94';
+export * from '../../../members/members/danielcobo';
+export * from '../../../members/members/danieljanderson';
+export * from '../../../members/members/danielrendox';
+export * from '../../../members/members/danieluhl';
+export * from '../../../members/members/danvgar';
+export * from '../../../members/members/dapoadedire';
+export * from '../../../members/members/davidalpert';
+export * from '../../../members/members/davidgsalgado';
+export * from '../../../members/members/DavidRod1865';
+export * from '../../../members/members/debrakayeelliott';
+export * from '../../../members/members/doleraj';
+export * from '../../../members/members/dominicduffin1';
+export * from '../../../members/members/eclecticCoding';
+export * from '../../../members/members/ehilst515';
+export * from '../../../members/members/evagracesmith';
+export * from '../../../members/members/fatimaOla';
+export * from '../../../members/members/funbunch';
+export * from '../../../members/members/gantman';
+export * from '../../../members/members/gervanna';
+export * from '../../../members/members/HDreikorn';
+export * from '../../../members/members/healeyb';
+export * from '../../../members/members/HpatricioH';
+export * from '../../../members/members/imanidev';
+export * from '../../../members/members/iotalex';
+export * from '../../../members/members/jamaalbrown';
+export * from '../../../members/members/jamescurran';
+export * from '../../../members/members/jamesrascal';
+export * from '../../../members/members/jasmine582';
+export * from '../../../members/members/jasonevans';
+export * from '../../../members/members/jdwilkin4';
+export * from '../../../members/members/jenieg';
+export * from '../../../members/members/jenkensDev';
+export * from '../../../members/members/JesseRWeigel';
+export * from '../../../members/members/jjshanks';
+export * from '../../../members/members/JoeKarow';
+export * from '../../../members/members/jonathanyeong';
+export * from '../../../members/members/JustinQuinn51';
+export * from '../../../members/members/kamalwalia';
+export * from '../../../members/members/kfairris';
+export * from '../../../members/members/kingahmedino';
+export * from '../../../members/members/kldickenson';
+export * from '../../../members/members/klezi10';
+export * from '../../../members/members/lauralangdon';
+export * from '../../../members/members/lennoxCodes';
+export * from '../../../members/members/LincolnFleet';
+export * from '../../../members/members/loganom';
+export * from '../../../members/members/lohityarra';
+export * from '../../../members/members/Lor1138';
+export * from '../../../members/members/LSanchez17';
+export * from '../../../members/members/lsparlin';
+export * from '../../../members/members/magsol';
+export * from '../../../members/members/matthewDean';
+export * from '../../../members/members/MattyMc';
+export * from '../../../members/members/maylenepoulsen';
+export * from '../../../members/members/mccurcio';
+export * from '../../../members/members/megGutshall';
+export * from '../../../members/members/michaeljolley';
+export * from '../../../members/members/mikerogers0';
+export * from '../../../members/members/mikestreety';
+export * from '../../../members/members/mjlueder';
+export * from '../../../members/members/mrsantons';
+export * from '../../../members/members/mtfoley';
+export * from '../../../members/members/muckitymuck';
+export * from '../../../members/members/narigo';
+export * from '../../../members/members/needcaffeine';
+export * from '../../../members/members/neilitalia';
+export * from '../../../members/members/nerajno';
+export * from '../../../members/members/nickytonline';
+export * from '../../../members/members/nicoolel';
+export * from '../../../members/members/niklasfyi';
+export * from '../../../members/members/norafergany';
+export * from '../../../members/members/ntinosng';
+export * from '../../../members/members/paceaux';
+export * from '../../../members/members/pedaars';
+export * from '../../../members/members/piotrszymaniec';
+export * from '../../../members/members/raaynaldo';
+export * from '../../../members/members/radturkin';
+export * from '../../../members/members/raeshelleRose';
+export * from '../../../members/members/ramonh';
+export * from '../../../members/members/redapy';
+export * from '../../../members/members/regromrob';
+export * from '../../../members/members/rek990';
+export * from '../../../members/members/rhdeck';
+export * from '../../../members/members/ridonky';
+export * from '../../../members/members/rishabh1S';
+export * from '../../../members/members/rmirville';
+export * from '../../../members/members/rreiso';
+export * from '../../../members/members/sadiejay';
+export * from '../../../members/members/SafetyVest2789';
+export * from '../../../members/members/saramccombs';
+export * from '../../../members/members/Satoshi-Sh';
+export * from '../../../members/members/sBlais';
+export * from '../../../members/members/secondl1ght';
+export * from '../../../members/members/sethburtonhall';
+export * from '../../../members/members/shaylalewis';
+export * from '../../../members/members/shelleymcq';
+export * from '../../../members/members/shiftyp';
+export * from '../../../members/members/shraddha';
+export * from '../../../members/members/simonprickett';
+export * from '../../../members/members/sirohub';
+export * from '../../../members/members/SNikhill';
+export * from '../../../members/members/sohodoll';
+export * from '../../../members/members/spike';
+export * from '../../../members/members/SuperRoach';
+export * from '../../../members/members/surajrpanchal';
+export * from '../../../members/members/SuzeShardlow';
+export * from '../../../members/members/tamihughes';
+export * from '../../../members/members/tammymiller';
+export * from '../../../members/members/tarynmcmillan';
+export * from '../../../members/members/teezzan';
+export * from '../../../members/members/terieyenike';
+export * from '../../../members/members/thacherhussain';
+export * from '../../../members/members/thegrumpyenby';
+export * from '../../../members/members/toddlibby';
+export * from '../../../members/members/tombousquet';
+export * from '../../../members/members/tomcudd';
+export * from '../../../members/members/torianne02';
+export * from '../../../members/members/VAggrippino';
+export * from '../../../members/members/vanessacor';
+export * from '../../../members/members/wheeleruniverse';
+export * from '../../../members/members/YolandaHaynes';
+export * from '../../../members/members/YufaLi';
+export * from '../../../members/members/ZenMnky';
+export * from '../../../members/members/zooglon';
\ No newline at end of file