merge pr, fix isPrimeNumber

TarsCloud · Dec 31, 2020 · 43155e5 · 43155e5
1 parent 834556d
commit 43155e5
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/util/src/tc_common.cpp b/util/src/tc_common.cpp
@@ -895,13 +895,8 @@ void TC_Common::ignorePipe()
 
 bool TC_Common::isPrimeNumber(size_t n)
 {
-<<<<<<< HEAD
-    size_t nn = (size_t) sqrt((double) n);
-    for (size_t i = 2; i < nn; i++)
-=======
     size_t nn = (size_t)sqrt((double)n);
     for(size_t i = 2; i <= nn;i++)
->>>>>>> fix tc_common prime judgment bug
     {
         if (n % i == 0)
         {