da230us/git-branch
1
0
Fork 0
forked from so679ir/git-repoZSI
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dávid Andrišov 2024-02-27 21:16:21 +01:00
commit c2eff666db
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index.html
View File

@ -32,16 +32,25 @@
<div class="col-md-4">
<h2>Heading 1</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<<<<<<< HEAD
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> origin/master
</div>
<div class="col-md-4">
<h2>Heading 2</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<<<<<<< HEAD
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> origin/master
</div>
<div class="col-md-4">
<h2>Heading 3</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<<<<<<< HEAD
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
</div>
@ -81,6 +90,9 @@
<h2>Nový Nadpis 9</h2>
<p>Popis pre novú sekciu 9.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> origin/master
</div>
</div>
</div>