Fix merge conflicts in models.backends

Author: rgerkin

neuronunit/models/backends/__init__.py

@@ -4,49 +4,20 @@
 import io
 import importlib
 import inspect
-<<<<<<< HEAD
-=======
 import pathlib
 import re
 import warnings
->>>>>>> 9fb0c2e613a1bf059f38eeeae80582d0cfb11f2f
 
 import sciunit.models.backends as su_backends
 from sciunit.utils import PLATFORM, PYTHON_MAJOR_VERSION
 from .base import Backend
+available_backends = su_backends.available_backends
 
-
-<<<<<<< HEAD
-try:
-    from .static import StaticBackend
-except ImportError:
-    StaticBackend = None
-    print('Could not load StaticBackend')
-
-try:
-    from .geppetto import GeppettoBackend
-except ImportError:
-    GeppettoBackend = None
-    print('Could not load GeppettoBackend')
-
-try:
-    from .jNeuroML import jNeuroMLBackend
-except ImportError:
-    jNeuroMLBackend = None
-    print('Could not load jNeuroMLBackend')
-
-##
-# Neuron support depreciated
-##
-#try:
-#    from .neuron import NEURONBackend
-#except ImportError:
-#    NEURONBackend = None
-#    print('Could not load NEURONBackend')
-
-=======
-
-backend_paths = ['adexp.JIT_ADEXPBackend',
+backend_paths = ['static.StaticBackend',
+                 'geppetto.GeppettoBackend',
+                 'jNeuroML.jNeuroMLBackend',
+                 #'neuron.NeuronBackend',
+                 'adexp.JIT_ADEXPBackend',
                  'izhikevich.JIT_IZHIBackend']
 def check_backend(partial_path):
     full_path = 'jithub.models.backends.%s' % partial_path
@@ -78,14 +49,8 @@ def register_backends(backend_paths):
     su_backends.register_backends(provided_backends)
 
 
-try:
-    register_backends(backend_paths)
->>>>>>> 9fb0c2e613a1bf059f38eeeae80582d0cfb11f2f
+register_backends(backend_paths)
 
-except:
-    register_backends(backend_paths)
-
-available_backends = su_backends.available_backends
 #from .adexp import ADEXPBackend
 #from .glif import GLIFBackend
 #from .l5pcSciUnit import L5PCBackend