Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

microservices/core/pom.xml

@@ -23,5 +23,5 @@
         <version>1.2.1</version>
   </dependency>
   </dependencies>
-  
 </project>
+

microservices/huertos/src/main/java/net/miarma/api/microservices/huertos/routing/middlewares/HuertosAuthGuard.java

@@ -41,6 +41,7 @@ public class HuertosAuthGuard extends AbstractAuthGuard<MemberEntity, HuertosUse
             if (member.getRole() == role) return true;
         }
         return false;
+<<<<<<< HEAD
     }
 
     @Override
@@ -76,5 +77,8 @@ public class HuertosAuthGuard extends AbstractAuthGuard<MemberEntity, HuertosUse
                 }
             });
         };
+=======
+>>>>>>> refs/remotes/origin/dev
     }
+
 }