From dc430cf7f20367b540127967027ee472c73b3ec3 Mon Sep 17 00:00:00 2001
From: Luca Frediani <luca.frediani@gmail.com>
Date: Sat, 9 Nov 2024 09:09:03 +0100
Subject: [PATCH] Fixes small leftovers after rebase

---
 CMakeLists.txt | 1 -
 src/driver.cpp | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0c4211b9e..291c574ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,6 @@ include(${PROJECT_SOURCE_DIR}/cmake/custom/omp.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/custom/sad_basis.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/custom/hirshfeld.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/custom/azora_potentials.cmake)
-include(${PROJECT_SOURCE_DIR}/cmake/custom/lebvedev.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/custom/main.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/custom/feature_summary.cmake)
 include(${PROJECT_SOURCE_DIR}/cmake/custom/tests.cmake)
diff --git a/src/driver.cpp b/src/driver.cpp
index 3216fd201..a95551c00 100644
--- a/src/driver.cpp
+++ b/src/driver.cpp
@@ -56,11 +56,8 @@
 #include "qmoperators/one_electron/NuclearGradientOperator.h"
 #include "qmoperators/one_electron/NuclearOperator.h"
 #include "qmoperators/one_electron/ZoraOperator.h"
-<<<<<<< HEAD
 #include "qmoperators/one_electron/AZoraPotential.h"
 #include "qmoperators/one_electron/NablaOperator.h"
-=======
->>>>>>> 44b016d0 (remove unused includes)
 
 #include "qmoperators/one_electron/H_BB_dia.h"
 #include "qmoperators/one_electron/H_BM_dia.h"