merge conflict

Artelnics · Dec 11, 2024 · 84ed8fe · 84ed8fe
2 parents edbc537 + 2441909
commit 84ed8fe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/opennn.pro b/opennn.pro
@@ -17,7 +17,7 @@ DEFINES += NDEBUG
 SUBDIRS += opennn
 SUBDIRS += examples
 SUBDIRS += blank
-#SUBDIRS += tests
+SUBDIRS += tests
 
 CONFIG += ordered
 

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -50,12 +50,7 @@ SOURCES += test.cpp \
            performance_test.cpp \
            pooling_layer_test.cpp \
            pch.cpp  # Precompiled header source
-
-# Include more test files if needed by uncommenting
-# SOURCES += perceptron_layer_test.cpp \
-#            pooling_layer_test.cpp \
-#            probabilistic_layer_3d_test.cpp \
-#            ...
+            # Include more test files if needed by uncommenting
 
 # Precompiled Header
 HEADERS += pch.h