Fixed merge

tchellomello · Oct 15, 2017 · 0fa903a · 0fa903a
1 parent ee22b8a
commit 0fa903a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pyarlo/camera.py b/pyarlo/camera.py
@@ -164,6 +164,8 @@ def triggers(self):
             if triggers:
                 return triggers
 
+        return None
+
     @property
     def battery_level(self):
         """Get the camera battery level."""