Fix merge conflicts

youtube · Oct 2, 2023 · cc900b4 · cc900b4
1 parent 9a8d031
commit cc900b4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 97 deletions.
diff --git a/third_party/angle/include/GLSLANG/ShaderVars.h b/third_party/angle/include/GLSLANG/ShaderVars.h
@@ -11,11 +11,7 @@
 #define GLSLANG_SHADERVARS_H_
 
 #include <algorithm>
-<<<<<<< HEAD
-=======
-#include <array>
 #include <cstdint>
->>>>>>> 00102040267 (Add missing cstdint includes (#1643))
 #include <string>
 #include <vector>
 

diff --git a/third_party/angle/src/common/angleutils.h b/third_party/angle/src/common/angleutils.h
@@ -14,11 +14,8 @@
 #include <climits>
 #include <cstdarg>
 #include <cstddef>
-<<<<<<< HEAD
-#include <string>
-=======
 #include <cstdint>
->>>>>>> 00102040267 (Add missing cstdint includes (#1643))
+#include <string>
 #include <set>
 #include <sstream>
 #include <vector>

diff --git a/third_party/crashpad/util/misc/reinterpret_bytes.cc b/third_party/crashpad/util/misc/reinterpret_bytes.cc
diff --git a/third_party/v8/src/inspector/v8-string-conversions.h b/third_party/v8/src/inspector/v8-string-conversions.h