lib/fiona7/scrivito_patches/workspace.rb in infopark_fiona7-0.30.0.2 vs lib/fiona7/scrivito_patches/workspace.rb in infopark_fiona7-0.70.0.1

@@ -1,12 +1,15 @@
 require 'scrivito/workspace'
 
 module Scrivito
   class Workspace
-    # Backport a "solution" for broken diff view
-    def base_revision
-      if base_revision_id
-        @base_revision ||= Revision.new(id: base_revision_id, content_state: base_content_state, workspace: self)
-      end
+    # there are no conflicts.
+    def conflict_warning_for(*args)
+      []
+    end
+
+    # there are no outdated workspaces
+    def outdated?
+      false
     end
   end
 end