Fixed Conflicts

This commit is contained in:
TheEmeraldStarr 2020-10-22 10:05:00 -07:00
parent e6fe8c5ae0
commit 04458d8383

View file

@ -80,7 +80,7 @@
console.log('particlesjs loaded.......'); console.log('particlesjs loaded.......');
}); });
</script> </script>
<<<<<<< HEAD <!-- YT Surf--> <!-- YT Surf-->
<div class="d-flex align-items-center order-12" style="height:200px;"> <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;"> <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"> <form id="unblocker-form" action="b" method="get">