Resolve merge conflict by incorporating both changes.

Change-Id: I3997980765d594afdea3a3c140132c20422ce349
youtube · Aug 14, 2024 · 7f1db14 · 7f1db14
1 parent 2f3f3ff
commit 7f1db14
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/starboard/shared/win32/file_open.cc b/starboard/shared/win32/file_open.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if SB_API_VERSION < 16
+#if SB_API_VERSION < 17
 
 #include "starboard/file.h"
 
@@ -42,4 +42,4 @@ SbFile SbFileOpen(const char* path,
   return new SbFilePrivate(file_handle);
 }
 
-#endif  // SB_API_VERSION < 16
+#endif  // SB_API_VERSION < 17