scm-ninja · isaacjaimep · Jun 25, 2024 · Jun 25, 2024 · Jun 25, 2024 · Jun 25, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+readme2.txt
+log/
diff --git a/.project b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>starter-web</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+	<classpathentry kind="src" path=""/>
+	<classpathentry kind="output" path=""/>
+</classpath>
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.container b/.settings/org.eclipse.wst.jsdt.ui.superType.container
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.JRE_CONTAINER
diff --git a/.settings/org.eclipse.wst.jsdt.ui.superType.name b/.settings/org.eclipse.wst.jsdt.ui.superType.name
@@ -0,0 +1 @@
+Global
diff --git a/404.html b/404.html
@@ -155,3 +155,4 @@ <h1>Not found <span>:(</span></h1>
         </div>
     </body>
 </html>
+cambio
diff --git a/README.md b/README.md
@@ -4,4 +4,16 @@ This repository is for showing how Git and GitHub work
 
 ## Purpose
 
-Sample website with plenty of files for demos
+Sample website with plenty of files for demos
+
+
+
+
+## This is another subtile
+
+djlskdjsldk
+
+### Tthis is another level of
+saas
+## recuerda que el commando git diff HEAD con la opcion de --staged, va a comparar lo que esta el commit local,( esdecir en el folder de git ) perddon en tu repositorio local es decir el ultimo commit con lo que esta en en stagged area
+okokok
diff --git a/fifth.txt b/fifth.txt
diff --git a/fourth.txt b/fourth.txt
diff --git a/humans.txt b/humans.txt
@@ -13,3 +13,4 @@
 
     HTML5, CSS3
     jQuery, Modernizr
+note in master
diff --git a/log/.gitignore b/log/.gitignore
@@ -0,0 +1 @@
+/log
diff --git a/log/access.2014-11-04 b/log/access.2014-11-04
diff --git a/log/access.log b/log/access.log
diff --git a/notasgit.txt b/notasgit.txt
diff --git a/readme2.txt b/readme2.txt
diff --git a/second.txt b/second.txt
@@ -0,0 +1 @@
+change into dev
diff --git a/simple.html b/simple.html
@@ -22,3 +22,5 @@
 	</footer>
 </body>
 </html>
+this change on feature branch
+change in simple html on develop