Merge: Repository Monitor

2013-04-30 13:33:06 +10:00
parent 52d57a35c2
commit f6849535b0
14 changed files with 638 additions and 1 deletions
@@ -76,10 +76,17 @@ namespace Disco.Data.Repository
            // Notify before changes are committed
            var changes = Monitor.RepositoryMonitor.BeforeSaveChanges(this);

+<<<<<<< HEAD
            changeCount = base.SaveChanges();

            if (changes.Length > 0)
            {
+=======
+            if (changes.Length > 0)
+            {
+                changeCount = base.SaveChanges();
+
+>>>>>>> origin/Repository-Monitor
                // Notify after changes are committed
                Monitor.RepositoryMonitor.AfterSaveChanges(this, changes);
            }