Merge pull request #1 from 190129/master

Finally pulling !! :)
bartizo12 · May 8, 2015 · c5648f9 · c5648f9
2 parents 794784b + 306cd7c
commit c5648f9
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,2 @@
-190136
-4CS
+190136
+4CS
diff --git a/index.html b/index.html
@@ -1,12 +1,28 @@
 <!DOCTYPE html>
 <html>
 	<head>
+<<<<<<< HEAD
+<<<<<<< HEAD
+	   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">	          
+=======
+		<link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
+<<<<<<< HEAD
+>>>>>>> Section2 title change
+=======
+>>>>>>> Section1 title change
+>>>>>>> Section1 title change
+	</head>
+	<body>
+		<nav class="navbar">
+			 <div class="navbar-header">
+=======
 		<link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	</head>
 	<body>
 		<nav class="navbar">
  <div class="navbar-header">
+>>>>>>> upstream/master
 		 <a class="navbar-brand" href="#">IISlabPIO</a>
 	 </div>
 	 <div class="collapse navbar-collapse">
@@ -15,6 +31,22 @@
    			<li><a href="#section2">Distributed revision control system</a></li>
    		</ul>
    	</div>
+<<<<<<< HEAD
+		</nav>
+		<section id="section1" class="panel panel-default">
+			<div class="panel-heading">
+<<<<<<< HEAD
+	    		<h3 class="panel-title">Section1 title</h3>
+=======
+	    		<h3 class="panel-title">Revision control systems</h3>
+>>>>>>> Section1 title change
+		  	</div>
+	  		<div class="panel-body">
+	    		Revision control system â€“ a software for tracing changes mainly in a source code and to facilitate programmers with combining changes introduced in files by many persons at different time.
+	  		</div>
+			<footer class="panel-footer">
+				<a href="http://en.wikipedia.org/wiki/Revision_control">Wikipedia</a>
+=======
 			Page navigation
 		</nav>
 		<section id="section1" class="panel panel-default">
@@ -28,10 +60,36 @@ <h3 class="panel-title">Section1 title<br>Revision control systems</h3>
 			<footer class="panel-footer">
 				Section1 footer<br>
 <a href="http://en.wikipedia.org/wiki/Revision_control">Wikipedia</a>
+>>>>>>> upstream/master
 			</footer>
 		</section>
 		<section id="section2" class="panel panel-default">
 			<div class="panel-heading">
+<<<<<<< HEAD
+	    		<h3 class="panel-title">Distributed revision control system.</h3>
+	  		</div>
+	  		<div class="panel-body">
+		    	In distributed revision control systems (such as Git, Mercurial, Bazaar lub Darcs) clients do not get access only to the news version of files but they copy the whole repository. When one of the servers used by these systems to inter-cooperate fails, the repository of any client can simply be copied to the server in order to restore it to work.
+<<<<<<< HEAD
+=======
+=======
+	    		<h3 class="panel-title">Distributed revision control system.</h3>
+	  		</div>
+	  		<div class="panel-body">
+		    	In distributed revision control systems (such as Git, Mercurial, Bazaar lub Darcs) clients do not get access only to the news version of files but they copy the whole repository. When one of the servers used by these systems to inter-cooperate fails, the repository of any client can simply be copied to the server in order to restore it to work.
+>>>>>>> master
+>>>>>>> Change in Section 2 title and content
+		  	</div>
+			<footer class="panel-footer">
+				<a href="http://git-scm.com/book/en/Getting-Started-About-Version-Control#Distributed-Version-Control-Systems">Git - manual</a>
+			</footer>
+		</section>
+		<footer  class="navbar">
+			Developed in the class 'GIT system - fundamentals' during Software Engineering laboratory in <a href="http://www.iis.p.lodz.pl/">Institute of Applied Computer Science PÅ</a> 
+		</footer>
+	</body>
+</html>
+=======
 	    		<h3 class="panel-title">Section2 title<br>Distributed revision control system.</h3>
 	  		</div>
 	  		<div class="panel-body">
@@ -42,9 +100,21 @@ <h3 class="panel-title">Section2 title<br>Distributed revision control system.</
 				Section2 footer
 			</footer>
 		</section>
+    <section id="section3" class="panel panel-default">
+		<div class="panel-heading">
+    		<h3 class="panel-title">Centralized revision control system.</h3>
+  		</div>
+  		<div class="panel-body">
+	    	In  centralized revision control systems, there is one central repository, storing all units subjected to version control, and many clients who are connecting to it via the service access the various versions of the documents.
+	  	</div>
+		<footer class="panel-footer">
+			<a href="http://git-scm.com/book/en/Getting-Started-About-Version-Control#Centralized-Version-Control-Systems">Git - manual</a>
+		</footer>
+</section>
 		<footer  class="navbar">
 Developed in the class 'GIT system - fundamentals' during Software Engineering laboratory in <a href="http://www.iis.p.lodz.pl/">Institute of Applied Computer Science P£</a> 
 			Page footer<br><a href="http://git-scm.com/book/en/Getting-Started-About-Version-Control#Distributed-Version-Control-Systems">Git - manual</a>
 		</footer>
 	</body>
 </html>
+>>>>>>> upstream/master