[NSH-2024] Two new sponsors (#16)

* Adds two sponsors

* Fixes some rebase issues

content/events/2024-nashville/welcome.md

@@ -21,25 +21,13 @@ Description = "DevOpsDays Nashville 2024"
   <div class = "col-md-3">
     {{< event_logo >}}
   </div>
-<<<<<<< HEAD
   <div class = "col-md-6" style="box-shadow: 0 4px 8px rgba(0,0,0,0.1); margin: 10px; padding: 10px; border-radius: 10px">
     <h1><p>Welcome to DevOps Days Nashville 2024</p></h1>
     <p>DevOps Days will be coming back to {{< event_location >}} on July 10th and 11th.</p>
     <h2 style="color: #C19A6B; display: inline-block;"><p>Guest Keynote Speaker John Willis!</h2>
     <p>We are happy to announce that <a href="https://itrevolution.com/author/john-willis/" target="_blank">John Willis</a> is our keynote speaker!</p>
     <h2><p><a href="https://www.papercall.io/devopsdays-nashville-2024" style="color: #C19A6B">Call for Proposals Open Until May 31st</a></p></h2>
     <p>Do you have a great topic for the community?  Visit our <a href="https://www.papercall.io/devopsdays-nashville-2024">Call for Speakers/Papers</a> site today!  We look forward to hearing from you.</p>
-
-=======
-  <div class = "col-md-6">
-    <h2><p>Welcome to DevOps Days Nashville 2024!</p></h2>
-    <p>We are excited to announce DevOps Days will be coming back to {{< event_location >}} on July 10th and 11th.</p>
-    <br>
-    <h2><p><a href="https://www.papercall.io/devopsdays-nashville-2024">Call for Proposals Now Open!</a></p></h2>
-    <p>Do you have a great topic for the community?  Visit our <a href="https://www.papercall.io/devopsdays-nashville-2024">Call for Speakers/Papers</a> site today!  We look forward to hearing from you.</p>
-
-  </div>
-</div>
 
 <p>Event Information</p>
 <div class = "row">
@@ -50,10 +38,6 @@ Description = "DevOpsDays Nashville 2024"
     {{< event_start >}} - {{< event_end >}}
   </div>
 </div>
-<<<<<<< HEAD
-
-=======
->>>>>>> e8a458459c (Adds 2024 event information)
 
 
 <div class = "row">

data/events/2024/nashville/main.yml

@@ -135,26 +135,12 @@ sponsors:
    level: gold
  - id: hasura
    level: gold
-#  - id: teleport
-#    level: gold
- - id: datadog
-   level: platinum
- - id: kubecareers
-   level: media
- - id: kubeevents
-   level: media
- - id: netappfsxn
-   level: gold
- - id: dynatrace
-   level: gold
- - id: hasura
-   level: gold
  - id: nashville-data-nerds
    level: community
-#  - id: gitlab
-#    level: gold
-#  - id: instana
-#    level: silver
+ - id: nss
+   level: community
+ - id: nashville-awsusergroup
+   level: community
 #  - id: trendmicro
 #    level: gold
 #  - id: redhat

data/sponsors/nashville-awsusergroup.yml

@@ -0,0 +1,2 @@
+name: "AWS User Group Nashville"
+url: "https://www.meetup.com/nawsug/"