Fix C25 xbox build failure on SbFileOpen. (youtube#3982)

b/302715109 (cherry picked from commit d4f1e95)
yjzhang111 · Aug 14, 2024 · f83867d · f83867d
1 parent f55f685
commit f83867d
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/starboard/shared/win32/file_open.cc b/starboard/shared/win32/file_open.cc
@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-<<<<<<< HEAD
-=======
 #if SB_API_VERSION < 17
 
->>>>>>> d4f1e954b1b (Fix C25 xbox build failure on SbFileOpen. (#3982))
 #include "starboard/file.h"
 
 #include "starboard/shared/win32/file_internal.h"
@@ -44,8 +41,5 @@ SbFile SbFileOpen(const char* path,
 
   return new SbFilePrivate(file_handle);
 }
-<<<<<<< HEAD
-=======
 
 #endif  // SB_API_VERSION < 17
->>>>>>> d4f1e954b1b (Fix C25 xbox build failure on SbFileOpen. (#3982))