re-import

sudorandom · Apr 16, 2024 · 8f6ad1e · 8f6ad1e
1 parent 9a1897d
commit 8f6ad1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/content/updates/imported/112277607006407737.html b/content/updates/imported/112277607006407737.html
@@ -38,15 +38,9 @@
       "language": "en",
       "uri": "https://infosec.exchange/users/briankrebs/statuses/112275804291554451",
       "url": "https://infosec.exchange/@briankrebs/112275804291554451",
-<<<<<<< HEAD
       "replies_count": 32,
-      "reblogs_count": 464,
+      "reblogs_count": 465,
       "favourites_count": 343,
-=======
-      "replies_count": 29,
-      "reblogs_count": 452,
-      "favourites_count": 332,
->>>>>>> b57742b6079138a32be08cae4d2170ebb4f5481e
       "edited_at": null,
       "local_only": false,
       "content": "<p>The U.S. government is warning that smart locks securing entry to an estimated 50,000 dwellings nationwide contain hard-coded credentials that can be used to remotely open any of the locks. The lock&#39;s maker Chirp Systems remains unresponsive, even though it was first notified about the critical weakness in March 2021. Meanwhile, Chirp&#39;s parent company, RealPage, Inc., is being sued by multiple U.S. states for allegedly colluding with landlords to illegally raise rents.</p><p><a href=\"https://krebsonsecurity.com/2024/04/crickets-from-chirp-systems-in-smart-lock-key-leak/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"ellipsis\">krebsonsecurity.com/2024/04/cr</span><span class=\"invisible\">ickets-from-chirp-systems-in-smart-lock-key-leak/</span></a></p>",
@@ -69,7 +63,7 @@
         "avatar_static": "https://media.infosec.exchange/infosec.exchange/accounts/avatars/109/292/943/884/713/975/original/aad1b6c1f00ab8ef.png",
         "header": "https://assets.infosec.exchange/headers/original/missing.png",
         "header_static": "https://assets.infosec.exchange/headers/original/missing.png",
-        "followers_count": 69269,
+        "followers_count": 69270,
         "following_count": 880,
         "statuses_count": 6095,
         "last_status_at": "2024-04-16",

diff --git a/data/mastodon.json b/data/mastodon.json
@@ -208,15 +208,9 @@
       "language": "en",
       "uri": "https://infosec.exchange/users/briankrebs/statuses/112275804291554451",
       "url": "https://infosec.exchange/@briankrebs/112275804291554451",
-<<<<<<< HEAD
       "replies_count": 32,
-      "reblogs_count": 464,
+      "reblogs_count": 465,
       "favourites_count": 343,
-=======
-      "replies_count": 29,
-      "reblogs_count": 452,
-      "favourites_count": 332,
->>>>>>> b57742b6079138a32be08cae4d2170ebb4f5481e
       "edited_at": null,
       "local_only": false,
       "content": "<p>The U.S. government is warning that smart locks securing entry to an estimated 50,000 dwellings nationwide contain hard-coded credentials that can be used to remotely open any of the locks. The lock&#39;s maker Chirp Systems remains unresponsive, even though it was first notified about the critical weakness in March 2021. Meanwhile, Chirp&#39;s parent company, RealPage, Inc., is being sued by multiple U.S. states for allegedly colluding with landlords to illegally raise rents.</p><p><a href=\"https://krebsonsecurity.com/2024/04/crickets-from-chirp-systems-in-smart-lock-key-leak/\" target=\"_blank\" rel=\"nofollow noopener noreferrer\" translate=\"no\"><span class=\"invisible\">https://</span><span class=\"ellipsis\">krebsonsecurity.com/2024/04/cr</span><span class=\"invisible\">ickets-from-chirp-systems-in-smart-lock-key-leak/</span></a></p>",
@@ -239,15 +233,9 @@
         "avatar_static": "https://media.infosec.exchange/infosec.exchange/accounts/avatars/109/292/943/884/713/975/original/aad1b6c1f00ab8ef.png",
         "header": "https://assets.infosec.exchange/headers/original/missing.png",
         "header_static": "https://assets.infosec.exchange/headers/original/missing.png",
-<<<<<<< HEAD
-        "followers_count": 69269,
+        "followers_count": 69270,
         "following_count": 880,
         "statuses_count": 6095,
-=======
-        "followers_count": 69254,
-        "following_count": 880,
-        "statuses_count": 6065,
->>>>>>> b57742b6079138a32be08cae4d2170ebb4f5481e
         "last_status_at": "2024-04-16",
         "hide_collections": false,
         "noindex": false,