search

EricssonResearch / scott-eu

SCOTT – Secure Connected Trustable Things
https://scottproject.eu/uc04-logistics-management-using-collaborative-robots-and-devops-methodologies/
Apache License 2.0
20 stars 8 forks source link

Issue 116 #171

Closed berezovskyi closed 5 years ago

jramadeu commented 5 years ago

This pull request has a lot of conflicts and, I believe, many of them are due a not so good practice.

@albertohata kept working on this branch although it was merged here. Therefore, the commits b5f2cd and 868e20 are one that matters and the others are just duplicated ( as they were already merged).

I advise to create a new branch from the master and them, apply the two last commits.

berezovskyi commented 5 years ago

What's the decision on this one?

albertohata commented 5 years ago

What's the decision on this one?

We can close this pull request. Made some commits by mistake in this branch, but we can ignore them.