fix conflict

[c11tester.git] / funcnode.h

diff --git a/funcnode.h b/funcnode.h
index 9df33343da4254a7b9858c7453990559af844fec..be6f406a4e3453b029247e8e23550deb9186cd99 100644 (file)
--- a/funcnode.h
+++ b/funcnode.h
@@ -36,7 +36,7 @@ private:
        uint32_t func_id;
        const char * func_name;
 
-       /* Use source line number as the key of hashtable, to check if 
+       /* Use source line number as the key of hashtable, to check if
         * atomic operation with this line number has been added or not
         */
        HashTable<const char *, FuncInst *, uintptr_t, 4, model_malloc, model_calloc, model_free> func_inst_map;