resolve merge conflicts, fixed flake8, updated bundle

src/operun/gallery/browser/gallery.py

@@ -42,15 +42,8 @@ def images(self):
         """
         Check if folder contains images and return images
         """
-<<<<<<< HEAD
-        folders = self.context.getFolderContents(
-            {'portal_type': ('Folder', 'Gallery',)}, full_objects=True)
-        images = self.context.getFolderContents(
-            {'portal_type': ('Image',)}, full_objects=True)
-=======
-        brains = api.content.find(
-            context=self.context, portal_type='Image', depth=1)
->>>>>>> 752877b1d801612ea7283ee17507ce4fd1d2db1d
+        folders = self.context.getFolderContents({'portal_type': ('Folder', 'Gallery',)}, full_objects=True)  # noqa
+        images = self.context.getFolderContents({'portal_type': ('Image',)}, full_objects=True)  # noqa
 
         items = []
 
@@ -60,8 +53,7 @@ def images(self):
                 description = obj.description
                 url = obj.absolute_url()
 
-                subimages = obj.getFolderContents(
-                    {'portal_type': ('Image',)}, full_objects=True)
+                subimages = obj.getFolderContents({'portal_type': ('Image',)}, full_objects=True)  # noqa
 
                 if subimages:
                     obj = choice(subimages)

src/operun/gallery/browser/static/gallery.js

@@ -11,11 +11,7 @@ require([
   'use strict';
 
   // Custom variables
-<<<<<<< HEAD
-
-=======
 
->>>>>>> 752877b1d801612ea7283ee17507ce4fd1d2db1d
   $('.gallery-image').each(function() {
     $(this).delay(Math.floor(Math.random() * 1000)).animate({opacity: 1}, 250);
   });

src/operun/gallery/browser/static/gallery.less

@@ -38,13 +38,7 @@
 
 /* Overrides */
 
-<<<<<<< HEAD
-.gallery-image a:focus,
-.gallery-image a:hover,
-.gallery-image a:active {
-  outline: 0 !important;
-=======
-.lightbox a:focus, .lightbox a:hover, .lightbox a:active {
+.gallery-image a,
+.lightbox a {
   outline: none !important;
->>>>>>> 752877b1d801612ea7283ee17507ce4fd1d2db1d
 }