Update from main to master

m1911star / affine-client

client for https://github.com/toeverything/AFFiNE

226 stars 10 forks source link

Update from main to master #3

Closed arthurmelton closed 2 years ago

arthurmelton commented 2 years ago

I realize I actually made a error with my other pr, this updates it from main to master.

m1911star commented 2 years ago

ah, in my opinion, i just want to keep up with the develop branch of main repo at least for now. So I will revert the previous commit and close this pr tomorrow, thanks.

arthurmelton commented 2 years ago

The master branch still gets updated very frequently.

mitsuhatu commented 2 years ago

The master branch will publish every two weeks.

m1911star commented 2 years ago

@mitsuhatu OK, i see~ @AMTitan Can you commit the changes again which i just revert before~thx~

arthurmelton commented 2 years ago

@m1911star I think you are going to have to resolve the conflicts and pick my updates over the origin. I think that is what you are asking for atleast.