Fixed Conflicts

zwpku · Dec 12, 2023 · 158f335 · 158f335
2 parents eeee166 + a244537
commit 158f335
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/colvar.cpp b/src/colvar.cpp
@@ -891,12 +891,12 @@ void colvar::define_component_types()
   add_component_type<customColvar>("CV with support of the Lepton custom function", "customColvar");
 #endif
 
+  add_component_type<neuralNetwork>("neural network CV for other CVs", "neuralNetwork");
+
 #ifdef TORCH
   add_component_type<torchANN>("CV defined by PyTorch artifical neural network models", "torchANN");
 #endif
 
-  add_component_type<neuralNetwork>("neural network CV for other CVs", "neuralNetwork");
-
   if (proxy->check_volmaps_available() == COLVARS_OK) {
     add_component_type<map_total>("total value of atomic map", "mapTotal");
   }