From 6d2b0d8454754df881c8901a0e7f6dd8c6017a6b Mon Sep 17 00:00:00 2001
From: Jordan Gensler <jgensler@netflix.com>
Date: Wed, 15 Dec 2021 17:37:38 -0500
Subject: [PATCH] Fix bad rebase

---
 compiler/crates/relay-transforms/src/apply_transforms.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/compiler/crates/relay-transforms/src/apply_transforms.rs b/compiler/crates/relay-transforms/src/apply_transforms.rs
index 3619209795799..5f880b514a889 100644
--- a/compiler/crates/relay-transforms/src/apply_transforms.rs
+++ b/compiler/crates/relay-transforms/src/apply_transforms.rs
@@ -134,7 +134,7 @@ fn apply_common_transforms(
     connection_interface: &ConnectionInterface,
     feature_flags: Arc<FeatureFlags>,
     node_interface_id_field: Option<StringKey>,
-    base_fragment_names: Arc<FnvHashSet<StringKey>>,
+    base_fragment_names: Arc<StringKeySet>,
     perf_logger: Arc<impl PerfLogger>,
 ) -> DiagnosticsResult<Arc<Program>> {
     let log_event = perf_logger.create_event("apply_common_transforms");
@@ -402,12 +402,8 @@ fn apply_typegen_transforms(
     project_name: StringKey,
     program: Arc<Program>,
     feature_flags: Arc<FeatureFlags>,
-<<<<<<< HEAD
-    base_fragment_names: Arc<StringKeySet>,
-=======
     node_interface_id_field: Option<StringKey>,
-    base_fragment_names: Arc<FnvHashSet<StringKey>>,
->>>>>>> d4315a7d83d (Mostly working configurable node interface ID)
+    base_fragment_names: Arc<StringKeySet>,
     perf_logger: Arc<impl PerfLogger>,
 ) -> DiagnosticsResult<Arc<Program>> {
     let log_event = perf_logger.create_event("apply_typegen_transforms");