s4:include: Fix code spelling

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/include/includes.h b/source4/include/includes.h
index f31072b361ae0738cbe252e8d8d69a505788920b..f22483080dcc4b1b43e5b6c5ebf8d386cd742829 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -36,7 +36,7 @@
 
 /* only do the C++ reserved word check when we compile
    to include --with-developer since too many systems
-   still have comflicts with their header files (e.g. IRIX 6.4) */
+   still have conflicts with their header files (e.g. IRIX 6.4) */
 
 #if !defined(__cplusplus) && defined(DEVELOPER) && defined(__linux__)
 #define class #error DONT_USE_CPLUSPLUS_RESERVED_NAMES