format

vgvassilev · Sep 10, 2024 · 44c675c · 44c675c
1 parent f00bbd0
commit 44c675c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/include/clad/Differentiator/DiffPlanner.h b/include/clad/Differentiator/DiffPlanner.h
@@ -7,6 +7,11 @@
 #include "clad/Differentiator/DynamicGraph.h"
 #include "clad/Differentiator/ParseDiffArgsTypes.h"
 
+<<<<<<< HEAD
+=======
+#include <iterator>
+#include <set>
+>>>>>>> 97c5e3f (format)
 namespace clang {
 class CallExpr;
 class CompilerInstance;