privacyguides/privacyguides.org
1
0
Fork 0
mirror of https://github.com/privacyguides/privacyguides.org.git synced 2025-10-31 03:26:35 +00:00
Code Issues 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
parent 912c21cc2c 99f1c80f0b
commit 2087293035
1 changed files with 1 additions and 0 deletions
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">