From 04458d8383f440bb236d63e16ada1ea855d30cb2 Mon Sep 17 00:00:00 2001
From: TheEmeraldStarr <46467239+Epicloudygamer@users.noreply.github.com>
Date: Thu, 22 Oct 2020 10:05:00 -0700
Subject: [PATCH] Fixed Conflicts

---
 public/y.html | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/public/y.html b/public/y.html
index 68746c89..83f9ba56 100644
--- a/public/y.html
+++ b/public/y.html
@@ -80,21 +80,21 @@
                             console.log('particlesjs loaded.......');
                         });
                     </script>
-                    <<<<<<< HEAD <!-- YT Surf-->
-                        <div class="d-flex align-items-center order-12" style="height:200px;">
-                            <div class="container text-center border rounded justify-content-center align-items-center button" style="color: rgb(255,255,255);filter: blur(0px);opacity: 0.95;">
-                                <form id="unblocker-form" action="b" method="get">
-                                    <p style="font-size: 46px;">Yout<wbr>ube Pr<wbr>oxy</p>
-                                    <p style="font-family: 'Montserrat Alternates', sans-serif;">Choose which proxy you would like to use. Below is some information.</p>
-                                    <p class="text-warning" style="font-size: 20px;font-family: Lato, sans-serif;">Having Issues?:<br></p>
-                                    <p class="text-warning" style="font-family: Lato, sans-serif;">If the page appears white, reload the page.<br>Lastly, if the page is marked as dangerous try using another Holy Unblocker link.</p>
-                                    <div class="btn-group" role="group" style="background-color: #030303;margin: 2%;padding: 1px;">
-                                        <a class="btn btn-lg btn-primary text-info border rounded-0 border-primary" role="button" data-bs-hover-animate="pulse" style="background-color: rgb(24,26,28);font-family: 'Montserrat Alternates', sans-serif;" href="/yh.html">YouTu<wbr>be Pr<wbr>oxy</a>
-                                        <a class="btn btn-lg btn-primary text-info border rounded-0 border-primary" role="button" data-bs-hover-animate="pulse" style="background-color: rgb(24,26,28);font-family: 'Montserrat Alternates', sans-serif; margin-left: 15px;" href="/ym.html">M<wbr>obil<wbr>e YouTu<wbr>be Pr<wbr>oxy</a>
-                                    </div>
-                                </form>
-                            </div>
+                    <!-- YT Surf-->
+                    <div class="d-flex align-items-center order-12" style="height:200px;">
+                        <div class="container text-center border rounded justify-content-center align-items-center button" style="color: rgb(255,255,255);filter: blur(0px);opacity: 0.95;">
+                            <form id="unblocker-form" action="b" method="get">
+                                <p style="font-size: 46px;">Yout<wbr>ube Pr<wbr>oxy</p>
+                                <p style="font-family: 'Montserrat Alternates', sans-serif;">Choose which proxy you would like to use. Below is some information.</p>
+                                <p class="text-warning" style="font-size: 20px;font-family: Lato, sans-serif;">Having Issues?:<br></p>
+                                <p class="text-warning" style="font-family: Lato, sans-serif;">If the page appears white, reload the page.<br>Lastly, if the page is marked as dangerous try using another Holy Unblocker link.</p>
+                                <div class="btn-group" role="group" style="background-color: #030303;margin: 2%;padding: 1px;">
+                                    <a class="btn btn-lg btn-primary text-info border rounded-0 border-primary" role="button" data-bs-hover-animate="pulse" style="background-color: rgb(24,26,28);font-family: 'Montserrat Alternates', sans-serif;" href="/yh.html">YouTu<wbr>be Pr<wbr>oxy</a>
+                                    <a class="btn btn-lg btn-primary text-info border rounded-0 border-primary" role="button" data-bs-hover-animate="pulse" style="background-color: rgb(24,26,28);font-family: 'Montserrat Alternates', sans-serif; margin-left: 15px;" href="/ym.html">M<wbr>obil<wbr>e YouTu<wbr>be Pr<wbr>oxy</a>
+                                </div>
+                            </form>
                         </div>
+                    </div>
                 </div>
             </div>
         </div>