New commits:
commit ff2331c2b94a68232ed0413ee2a1d50b370d6ce4
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/upstart: conflicts with epoch
commit 1a5683264a6f8592fa21edc8b15355f4f80ca5a0
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/initng: added CONFLICTS
commit a258661ae46b1fe5986a3c50b43db5d20af56412
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
smgl/simpleinit-msb: conflicts with epoch
diff --git a/smgl/initng/CONFLICTS b/smgl/initng/CONFLICTS
new file mode 100755
index 0000000..39a9019
--- /dev/null
+++ b/smgl/initng/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts upstart &&
+conflicts simpleinit-msb &&
+conflicts epoch
diff --git a/smgl/initng/HISTORY b/smgl/initng/HISTORY
index a9db4d6..de0080b 100644
--- a/smgl/initng/HISTORY
+++ b/smgl/initng/HISTORY
@@ -1,3 +1,6 @@
+2015-02-17 Pavel Vinogradov <public AT sourcemage.org>
+ * CONFLICTS: added
+
2007-12-05 Elisamuel Resto <ryuji AT sourcemage.org>
* BUILD: use cmake_build from FUNCTIONS