Failed to apply patch for include/v8-version.h:
While running git apply --index -3 -p1;
error: patch failed: include/v8-version.h:11
Falling back to three-way merge...
Applied patch to 'include/v8-version.h' with conflicts.
U include/v8-version.h
Patch: include/v8-version.h
Index: include/v8-version.h
diff --git a/include/v8-version.h b/include/v8-version.h
index
459abafcff42a1e7a6b7a0e5229aaf6e3e4359d3..c4333c7160a7fa802b4a3fdc837646f49435579a
100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 5
#define V8_BUILD_NUMBER 103
-#define V8_PATCH_LEVEL 23
+#define V8_PATCH_LEVEL 22
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
https://codereview.chromium.org/1308363002/
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
