Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Importer corrections #553

Merged
merged 10 commits into from
Apr 29, 2021
Merged

Importer corrections #553

merged 10 commits into from
Apr 29, 2021

Conversation

georgeDaskalakis
Copy link
Contributor

Pluging in the importer updates to MoBi

@abdelr
Copy link
Member

abdelr commented Apr 21, 2021

@georgeDaskalakis There are conflicting files. I suggest we merge develop into the local branch first so we can locally solve the conflicts.

@georgeDaskalakis
Copy link
Contributor Author

@georgeDaskalakis There are conflicting files. I suggest we merge develop into the local branch first so we can locally solve the conflicts.

@abdelr you are right. I have merged the develop into the branch.

Copy link
Member

@msevestre msevestre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reference to core corrupted

src/MoBi.Assets/AppConstants.cs Show resolved Hide resolved
src/MoBi.Assets/MoBi.Assets.csproj Outdated Show resolved Hide resolved
src/MoBi.Presentation/Tasks/ObservedDataTask.cs Outdated Show resolved Hide resolved
src/MoBi.Assets/MoBi.Assets.csproj Outdated Show resolved Hide resolved
src/MoBi.Core/MoBi.Core.csproj Outdated Show resolved Hide resolved
Copy link
Member

@msevestre msevestre left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am still unsure about this molweight stuff. If this is done in Core, then this can be removed.
If not, then this needs to be renamed :)

src/MoBi.Presentation/Tasks/ObservedDataTask.cs Outdated Show resolved Hide resolved
@msevestre msevestre merged commit c013eec into develop Apr 29, 2021
@msevestre msevestre deleted the importer_corrections branch April 29, 2021 12:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants