Fix remaining conflicts, remove FASTA generator

Author: natecook1000

Sources/RegexBenchmark/Inputs/DnaFASTA.swift

@@ -1,3 +1,18 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+//
+//===----------------------------------------------------------------------===//
+
+// Generated using one of the "fasta" programs in
+// the Computer Language Benchmarks Game:
+// https://benchmarksgame-team.pages.debian.net/benchmarksgame/description/fasta.html#fasta
+
 extension Inputs {
   static let dnaFASTA = """
 >ONE Homo sapiens alu

Utils/benchmark-generators/generateEmails.py

@@ -1,9 +1,3 @@
-<<<<<<< HEAD
-# python3 generateEmails.py > output.txt
-
-import string
-import random
-=======
 ##===----------------------------------------------------------------------===##
 ##
 ## This source file is part of the Swift.org open source project
@@ -21,7 +15,6 @@
 import string
 
 random.seed(0)
->>>>>>> main
 
 domain_charset = string.ascii_letters + string.digits + ".-"
 locale_charset = domain_charset + "_%+"
@@ -31,19 +24,6 @@
 # for the most part this will generate mostly valid emails
 # there are some edge cases with double hyphens and double periods that cause
 # issues but otherwise this should work
-<<<<<<< HEAD
-
-for _ in range(n):
-  domain_len = random.randint(2,64)
-  locale_len = random.randint(2,64)
-  tld_len = random.randint(2,10)
-  
-  domain = "".join(random.sample(domain_charset, domain_len))
-  locale = "".join(random.sample(locale_charset, locale_len))
-  tld = "".join(random.sample(string.ascii_lowercase, tld_len))
-  email = locale + "@" + domain + "." + tld
-  print(email.lower())
-=======
 emails = []
 for _ in range(n):
     domain_len = random.randint(2, 64)
@@ -69,4 +49,3 @@
 email_text = "\n    ".join(emails)
 email_list_formatted = "[" + ",\n    ".join(["\"" + x + "\"" for x in emails]) + "]"
 print(res.format(email_text, email_list_formatted))
->>>>>>> main

Utils/benchmark-generators/generateFasta.py

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 ##===----------------------------------------------------------------------===##
 ##
 ## This source file is part of the Swift.org open source project
@@ -11,7 +9,6 @@
 ##
 ##===----------------------------------------------------------------------===##
 
->>>>>>> main
 # Generates lines of junk unicode wrapped in html tags
 import random
 
@@ -30,12 +27,6 @@
 minLine = 10
 maxLine = 100
 
-<<<<<<< HEAD
-def get_random(i):
-   return "".join([chr(random.randint(low, high)) for _ in range(i)])
-   
-lines = [start + get_random(random.randint(minLine, maxLine)) + end for _ in range(numLines)]
-=======
 
 def get_random(i):
     return "".join([chr(random.randint(low, high)) for _ in range(i)])
@@ -45,6 +36,5 @@ def get_random(i):
     start + get_random(random.randint(minLine, maxLine)) + end
     for _ in range(numLines)
 ]
->>>>>>> main
 
 print("\n".join(lines))