Fix compiling error and some clippy warnings.

TeamAtomECS / AtomECS

Cold atom simulation code

GNU General Public License v3.0

46 stars 11 forks source link

Fix compiling error and some clippy warnings. #61

Closed necokeine closed 2 years ago

ElliotB256 commented 2 years ago

After merging the other PR into master, this one flagged up a few different conflicts. They look to be mostly inconcistencies on tabs vs spaces, from what I could tell - could you verify if that is correct? thanks!

necokeine commented 2 years ago

I suppose you want to rebase this PR onto the new master head, I will remove the last Merge branch commit and rebase my PR onto the newest master branch.

necokeine commented 2 years ago

Hi @ElliotB256 I replaced all tab in this project into 4 spaces, and it looks better now. If there is still some new conflict, or any other required changes, please comment here and I will do those changes.

ElliotB256 commented 2 years ago

cheers, starting the CI now

necokeine commented 2 years ago

Could you help me to merge this PR? it seems I don't have permission to do so.

ElliotB256 commented 2 years ago

I'ved merged it now, thanks for submitting :) I started the CI before I left yesterday and only just came back to it