scm-ninja · sscalzo · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.orig
diff --git a/README.md b/README.md
@@ -1,7 +1,27 @@
-# Starter Web Repo
+# Starter Web Project
 
+## Introduction
 This repository is for showing how Git and GitHub work
+hello, hi
 
 ## Purpose
 
-Sample website with plenty of files for demos
+Sample website with plenty of files for demos; addition
+
+adding stuff for example
+
+making changes on feature branch
+
+## How to Contribute
+
+fork this repo then add pull requests for review.
+
+## Deployment
+
+more stuff
+even more stuff
+
+## Copyright
+
+Git.Training. All rights reserved.
+emergency fix
diff --git a/hipster.txt b/hipster.txt
diff --git a/humans.txt b/humans.txt
@@ -4,12 +4,15 @@
 # TEAM
 
     <name> -- <role> -- <twitter>
+	sydney scalzo
 
 # THANKS
 
-    <name>
+    to all
+	leave a review!
 
 # TECHNOLOGY COLOPHON
 
     HTML5, CSS3
     jQuery, Modernizr
+	hello
diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
     <head>
         <meta charset="utf-8">
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <title></title>
+        <title>title for examples</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
@@ -45,7 +45,7 @@
             <div class="form-group">
               <input type="password" placeholder="Password" class="form-control">
             </div>
-            <button type="submit" class="btn btn-success">Sign in</button>
+            <button type="submit" class="btn btn-success">Login in</button>
           </form>
         </div><!--/.navbar-collapse -->
       </div>

diff --git a/level1/l1.txt b/level1/l1.txt
@@ -0,0 +1,3 @@
+I'm baby typewriter art party meggings Brooklyn sus, small batch ethical kitsch try-hard pabst blackbird spyplane stumptown swag. Taiyaki tousled woke paleo helvetica butcher. 8-bit art party ugh sriracha plaid artisan. Iceland hashtag hot chicken succulents, portland sus gastropub marfa cupping banjo kale chips. Sus literally jean shorts enamel pin gentrify tumeric neutra put a bird on it. 90's YOLO gluten-free kale chips ascot tacos DSA microdosing retro cloud bread keytar forage activated charcoal distillery. Intelligentsia tote bag coloring book sus enamel pin chartreuse yr williamsburg cliche tbh DIY venmo.
+
+YOLO retro tbh, lomo vexillologist adaptogen coloring book man bun truffaut knausgaard fingerstache trust fund affogato. Tbh gentrify distillery, knausgaard mixtape sartorial humblebrag paleo artisan. Cornhole franzen viral blue bottle waistcoat master cleanse umami jean shorts mumblecore kombucha chillwave Brooklyn. Hexagon brunch XOXO, seitan waistcoat thundercats pinterest shaman lyft. Glossier shaman selvage photo booth. Keytar copper mug green juice lomo photo booth, tacos banjo vape semiotics.
diff --git a/level1/level2/level3/level2.txt b/level1/level2/level3/level2.txt
@@ -0,0 +1,3 @@
+I'm baby cold-pressed blue bottle paleo live-edge polaroid crucifix bushwick small batch fashion axe freegan. Salvia marxism mlkshk, typewriter authentic dreamcatcher deep v. Four loko next level jawn bruh VHS etsy. Pork belly echo park knausgaard gatekeep microdosing jean shorts fam 90's occupy. Edison bulb iceland tonx af. Same +1 pug, disrupt meggings actually banh mi asymmetrical gastropub hammock jean shorts 90's marfa.
+
+Tacos big mood tousled flannel shoreditch williamsburg kombucha street art neutral milk hotel yr roof party tumblr. Solarpunk master cleanse neutra, ennui green juice echo park readymade. Paleo sustainable 8-bit, shoreditch hexagon tilde direct trade +1 chambray irony poutine squid beard meggings. Gentrify master cleanse hexagon leggings flexitarian portland cronut cliche lomo 8-bit bespoke letterpress. Schlitz migas blackbird spyplane, fanny pack four loko jawn tousled keffiyeh green juice. Mustache roof party unicorn photo booth. Beard direct trade ethical, marxism migas vexillologist jianbing tousled edison bulb gorpcore.
diff --git a/simple.html b/simple.html
@@ -1,6 +1,11 @@
 <!DOCTYPE html>
+
+<!--
+	Copyright 2014
+
+-->
 <head>
-	<title></title>
+	<title>Updating Title again and again</title>
 	<link rel="stylesheet" href="css/bootstrap.min.css">
 	<style>
 		body {
@@ -14,11 +19,11 @@
 	<main class="container">
 	<!-- Content Goes Here -->
 		<p>
-			Just some content
+			conflicting change
 		</p>
 	</main>
 	<footer class="container">
-		<p>&copy; Company 2014</p>
+		<p>&copy; 2014 git training, all rights reserved</p>
 	</footer>
 </body>
 </html>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		I'm baby typewriter art party meggings Brooklyn sus, small batch ethical kitsch try-hard pabst blackbird spyplane stumptown swag. Taiyaki tousled woke paleo helvetica butcher. 8-bit art party ugh sriracha plaid artisan. Iceland hashtag hot chicken succulents, portland sus gastropub marfa cupping banjo kale chips. Sus literally jean shorts enamel pin gentrify tumeric neutra put a bird on it. 90's YOLO gluten-free kale chips ascot tacos DSA microdosing retro cloud bread keytar forage activated charcoal distillery. Intelligentsia tote bag coloring book sus enamel pin chartreuse yr williamsburg cliche tbh DIY venmo.

		YOLO retro tbh, lomo vexillologist adaptogen coloring book man bun truffaut knausgaard fingerstache trust fund affogato. Tbh gentrify distillery, knausgaard mixtape sartorial humblebrag paleo artisan. Cornhole franzen viral blue bottle waistcoat master cleanse umami jean shorts mumblecore kombucha chillwave Brooklyn. Hexagon brunch XOXO, seitan waistcoat thundercats pinterest shaman lyft. Glossier shaman selvage photo booth. Keytar copper mug green juice lomo photo booth, tacos banjo vape semiotics.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		I'm baby cold-pressed blue bottle paleo live-edge polaroid crucifix bushwick small batch fashion axe freegan. Salvia marxism mlkshk, typewriter authentic dreamcatcher deep v. Four loko next level jawn bruh VHS etsy. Pork belly echo park knausgaard gatekeep microdosing jean shorts fam 90's occupy. Edison bulb iceland tonx af. Same +1 pug, disrupt meggings actually banh mi asymmetrical gastropub hammock jean shorts 90's marfa.

		Tacos big mood tousled flannel shoreditch williamsburg kombucha street art neutral milk hotel yr roof party tumblr. Solarpunk master cleanse neutra, ennui green juice echo park readymade. Paleo sustainable 8-bit, shoreditch hexagon tilde direct trade +1 chambray irony poutine squid beard meggings. Gentrify master cleanse hexagon leggings flexitarian portland cronut cliche lomo 8-bit bespoke letterpress. Schlitz migas blackbird spyplane, fanny pack four loko jawn tousled keffiyeh green juice. Mustache roof party unicorn photo booth. Beard direct trade ethical, marxism migas vexillologist jianbing tousled edison bulb gorpcore.