Versioning.

Identifier: 273664.1360@safari-7619.1.5.6-branch
WebKit · Mar 11, 2024 · d371998 · d371998
1 parent 7c85cff
commit d371998
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Configurations/Version.xcconfig b/Configurations/Version.xcconfig
@@ -24,7 +24,11 @@
 MAJOR_VERSION = 619;
 MINOR_VERSION = 1;
 TINY_VERSION = 5;
+<<<<<<< HEAD
 MICRO_VERSION = 8;
+=======
+MICRO_VERSION = 9;
+>>>>>>> f90d0d7860fa (Versioning.)
 NANO_VERSION = 0;
 FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION).$(TINY_VERSION).$(MICRO_VERSION);