resolve conflict with patch that fixes builds

Expensify · Jul 15, 2024 · 0496817 · 0496817
1 parent 7a70607
commit 0496817
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch
@@ -3062,8 +3062,4 @@ index 878f7ba..0000000
 -
 -#Files generated by the VS build
 -**/Generated Files/**
-<<<<<<< HEAD
 -
-=======
--
->>>>>>> 20eb52e6 (Merge pull request #45332 from Expensify/jules-androidBuildFailure)