From d675b54e1af9d175727a607d266a20f26cabd7c5 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Sat, 24 Apr 2010 15:00:08 -0500
Subject: Core: Allow the specification of plugin conflicts (Fix for Ticket
 #875)

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
---
 src/lib/Server/Plugin.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/lib/Server/Plugin.py')

diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 2e4974a84..f3b97b336 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -56,6 +56,7 @@ class Plugin(object):
     __rmi__ = ['toggle_debug']
     experimental = False
     deprecated = False
+    conflicts = []
 
     def __init__(self, core, datastore):
         object.__init__(self)
-- 
cgit v1.2.3-1-g7c22