www/proprietary proprietary-surveillance.html w...

[Therese Godefroy]

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 21/01/15 11:47:41

Modified files:
        proprietary    : proprietary-surveillance.html 
        proprietary/workshop: mal.rec 

Log message:
        Fix a conflict.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/proprietary-surveillance.html?cvsroot=www&r1=1.367&r2=1.368
http://web.cvs.savannah.gnu.org/viewcvs/www/proprietary/workshop/mal.rec?cvsroot=www&r1=1.287&r2=1.288

Patches:
Index: proprietary-surveillance.html
===================================================================
RCS file: /webcvs/www/www/proprietary/proprietary-surveillance.html,v
retrieving revision 1.367
retrieving revision 1.368
diff -u -b -r1.367 -r1.368
--- proprietary-surveillance.html       15 Jan 2021 16:18:35 -0000      1.367
+++ proprietary-surveillance.html       15 Jan 2021 16:47:41 -0000      1.368
@@ -482,7 +482,6 @@
   <li id="M202101080">
     <p>As of 2021, WhatsApp (one of Facebook's subsidiaries) is <a
     
href="https://www.forbes.com/sites/carlypage/2021/01/08/whatsapp-tells-users-share-your-data-with-facebook-or-well-deactivate-your-account/";>forcing
-    its users to hand over sensitive personal data</a> with its parent
     its users to hand over sensitive personal data</a> to its parent
     company. This increases Facebook's power over users, and further
     jeopardizes people's privacy and security.</p>
@@ -2852,7 +2851,7 @@
 
 <p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2021/01/15 16:18:35 $
+$Date: 2021/01/15 16:47:41 $
 <!-- timestamp end -->
 </p>
 </div>

Index: workshop/mal.rec
===================================================================
RCS file: /webcvs/www/www/proprietary/workshop/mal.rec,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- workshop/mal.rec    15 Jan 2021 16:18:36 -0000      1.287
+++ workshop/mal.rec    15 Jan 2021 16:47:41 -0000      1.288
@@ -32,11 +32,7 @@
 Keywords: WhatsApp, Facebook, Surveillance
 Blurb: <p>As of 2021, WhatsApp (one of Facebook's subsidiaries) is <a
 +   
href="https://www.forbes.com/sites/carlypage/2021/01/08/whatsapp-tells-users-share-your-data-with-facebook-or-well-deactivate-your-account/";>forcing
-<<<<<<< mal.rec
-+   its users to hand over sensitive personal data</a> with its parent
-=======
 +   its users to hand over sensitive personal data</a> to its parent
->>>>>>> 1.286
 +   company. This increases Facebook's power over users, and further
 +   jeopardizes people's privacy and security.</p>
 +