Skip to content

Commit

Permalink
Add mat.py
Browse files Browse the repository at this point in the history
  • Loading branch information
@nbouziani
nbouziani committed Nov 14, 2021
1 parent 6d39e69 commit 520078b
Showing 1 changed file with 1,205 additions and 0 deletions.
Loading

2 comments on commit 520078b

@wence-
Copy link
Member

@wence- wence- commented on 520078b Nov 14, 2021

Choose a reason for hiding this comment

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

I recommend that you just reset your branch to current trunk and manually port your state-tracking over. This manual import of the new files is going to cause an almighty merge conflict.

@nbouziani
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I recommend that you just reset your branch to current trunk and manually port your state-tracking over. This manual import of the new files is going to cause an almighty merge conflict.

Thanks! Yes it is actually what I did (cf. previous commit) but I inadvertently deleted mat.py over the course of reporting my state-tracking changes. So this commit just restitutes this lost file from master.

Please sign in to comment.