Merge remote-tracking branch 'origin/develop'

We'll only use the master branch for development from now on.

1 files changed, 1 insertions, 12 deletions

diff --git a/app/models/api_user.rb b/app/models/api_user.rb
index 2efe1cb..c70cccb 100644
--- a/app/models/api_user.rb
+++ b/app/models/api_user.rb
@@ -3,21 +3,10 @@ class ApiUser < AnonymousUser
 end
 
 #
-# A user that has limited admin access, to be used
-# for running monitor tests against a live production
-# installation.
-#
-class ApiMonitorUser < ApiUser
-  def is_monitor?
-    true
-  end
-end
-
-#
 # Not yet supported:
 #
 #class ApiAdminUser < ApiUser
 #  def is_admin?
 #    true
 #  end
-#end
\ No newline at end of file
+#end