Merges conflict

ygyash · ygyash · commit 3d517385069e · 2019-12-14T13:21:25.000-07:00
diff --git a/README.md b/README.md
@@ -1 +1,3 @@
 # ieeebitm19
+
+Background Picture Credits: Tezash Sahoo
diff --git a/contact.html b/contact.html
@@ -348,4 +348,4 @@ <h5>We're on social networks</h5>
 }
     </script>
 </body> 
-</html>
+</html>
diff --git a/css/gallery.css b/css/gallery.css
@@ -1,5 +1,3 @@
-
-
 .content {
     text-align: center;
 }
diff --git a/form_action.php b/form_action.php
@@ -22,4 +22,4 @@
 if($name!="" && $email!="" && $phone!="" && $message!="") {
     mail($to, $subject, $body, $headers);
 }
-?>
+?>
diff --git a/hackabit.html b/hackabit.html
@@ -78,8 +78,8 @@ <h2>HACK-A-BIT</h2>
         <div class="col-md-6 content">
           <h2>A 36 Hour long Hackathon which rekindled the minds of participants from all over India to innovate and inspire.</h2>
           <h3>The event witnessed the active participation of students not only from our college but also from other colleges all over India.
-              The particiapting teams addressed some problem and tried to find out a solution. Every idea was a masterpiece in itself.
-               Apart from Hackathon the event also included guest lectures by emminent personalities like Sandeep, the CEO of Geeks-for-Geeks.</h3>
+              The participating teams addressed some problem and tried to find out a solution. Every idea was a masterpiece in itself.
+               Apart from Hackathon the event also included guest lectures by eminent personalities like Sandeep, the CEO of Geeks-for-Geeks.</h3>
           <p>
            
           </p>
@@ -98,7 +98,7 @@ <h3>The event witnessed the active participation of students not only from our c
             <div class="container wow fadeIn">
               <div class="section-header">
                 <h3 class="section-title">AT A GLANCE</h3>
-                <p class="section-description">The event came out to be a huge sucess.</p>
+                <p class="section-description">The event came out to be a huge success.</p>
               </div>
               <div class="row counters">
       
diff --git a/index.html b/index.html
@@ -1,8 +1,13 @@
 <!DOCTYPE html>
 <html>
 
+<<<<<<< HEAD
 <head><meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
   
+=======
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
+>>>>>>> origin/master
 	<meta name="description" content="Welcome to the Official IEEE Student Branch BIT Mesra Website. IEEE Student Branch BIT Mesra is a registered student branch under IEEE Region 10 Kolkata Region.">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/js/wow.min.js b/js/wow.min.js
diff --git a/megaproject.html b/megaproject.html
@@ -1,8 +1,11 @@
 <!DOCTYPE html>
 <html>
 
+
 <head><meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
   
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=euc-jp">
 	<meta name="description" content="Welcome to the Official IEEE Student Branch BIT Mesra Website. IEEE Student Branch BIT Mesra is a registered student branch under IEEE Region 10 Kolkata Region.">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -126,7 +129,7 @@ <h2>PROJECTS</h2>
                 </li>
               <li>
                   <a href="#" data-largesrc="img/project/5.jpg" data-title="Ultrasonic radar - Vivek Raj Gupta" data-description="This project includes the integration of Arduino and Processing IDE to form a radar. The Arduino sends the data( Distance and angle) to the processing through serial communication, thus displaying its position on radar and the buzzer goes on according to the distance of the object.">
-                    <button class="accordion">Ultrasonic radar</button>
+                   <button class="accordion">Ultrasonic radar</button>
                   </a>
                 </li>
               <li>
diff --git a/workshop.html b/workshop.html
@@ -221,7 +221,10 @@ <h5>We're on social networks</h5>
   <script src="js/stellar.js"></script>
   <script src="js/waypoints.min.js"></script>
   <script src="js/counterup.min.js"></script>
-
+  <!-- Contact Form JavaScript File -->
+  <script src="contactform/contactform.js"></script>
+  <script src="js/down-button.js"></script>
+  <!-- Template Custom Javascript File -->
   <script src="js/custom.js"></script>
 
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`# ieeebitm19`
	`2`	`+`
	`3`	`+Background Picture Credits: Tezash Sahoo`
Original file line number	Diff line number	Diff line change
`@@ -348,4 +348,4 @@ <h5>We're on social networks</h5>`
`348`	`348`	`}`
`349`	`349`	`</script>`
`350`	`350`	`</body>`
`351`		`-</html>`
	`351`	`+</html>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-`
`2`		`-`
`3`	`1`	`.content {`
`4`	`2`	`text-align: center;`
`5`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@`
`22`	`22`	`if($name!="" && $email!="" && $phone!="" && $message!="") {`
`23`	`23`	`mail($to, $subject, $body, $headers);`
`24`	`24`	`}`
`25`		`-?>`
	`25`	`+?>`