Git-Mirrors/privacyguides.org
1
0
Fork 0
mirror of https://github.com/privacyguides/privacyguides.org.git synced 2024-10-01 01:35:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved conflict in index.html by combining both explanations

Browse Source
This commit is contained in:
arcadius3d 2017-06-15 22:01:24 -03:00
commit 2087293035
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
index.html
View File

@ -2622,6 +2622,7 @@
<div class="col-sm-4"> <div class="col-sm-4">
<div class="panel panel-success"> <div class="panel panel-success">
<div class="panel-heading"> <div class="panel-heading">
<<<<<<< HEAD
<h3 class="panel-title">LineageOS</h3> <h3 class="panel-title">LineageOS</h3>
</div> </div>
<div class="panel-body"> <div class="panel-body">