test1

algapster · Jun 17, 2024 · a650267 · a650267
1 parent 00aba99
commit a650267
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/rss_data.py b/rss_data.py
@@ -67,7 +67,6 @@
         {"name": "Corelan Team", "url": "https://www.corelan.be/index.php/feed/"},
         {"name": "NCC Group Research", "url": "https://research.nccgroup.com/feed/"},
         {"name": "Alexander Popov", "url": "https://a13xp0p0v.github.io/feed.xml"},
-<<<<<<< HEAD
         {"name": "Windows Internals Blog", "url": "https://windows-internals.com/feed/"},
         {"name": "nist-analyzed", "url": "https://nvd.nist.gov/feeds/xml/cve/misc/nvd-rss-analyzed.xml"},
         {"name": "nist-upcoming", "url": "https://nvd.nist.gov/feeds/xml/cve/misc/nvd-rss.xml"},
@@ -78,9 +77,6 @@
         {"name": "inthewild", "url": "https://raw.githubusercontent.com/gmatuz/inthewilddb/master/rss.xml"},
         {"name": "tenable", "url": "https://www.tenable.com/cve/feeds?sort=newest"},
         {"name": "center-for-internet-security", "url": "https://www.cisecurity.org/feed/advisories"}
-=======
-        {"name": "Windows Internals Blog", "url": "https://windows-internals.com/feed/"}
->>>>>>> parent of 2dc8392 (Update pagination function)
     ]
 }