search

jdev082 / freecat

The FreeCat Web Browser
Other
5 stars 5 forks source link

Remove conflict markers, consolidate license #110

Closed hello-smile6 closed 2 years ago

jdev082 commented 2 years ago

Your PR will be reviewed over the next 24 hours. Please continue to thoroughly test your code. make sure its based off main, and up to date

hello-smile6 commented 2 years ago

Your PR will be reviewed over the next 24 hours. Please continue to thoroughly test your code. make sure its based off main, and up to date

I've tested, and it works.

jdev082 commented 2 years ago

Your PR will be reviewed over the next 24 hours. Please continue to thoroughly test your code. make sure its based off main, and up to date

I've tested, and it works.

24 hour review will still continue

hello-smile6 commented 2 years ago

Your PR will be reviewed over the next 24 hours. Please continue to thoroughly test your code. make sure its based off main, and up to date

I've tested, and it works.

24 hour review will still continue

Fine. Say bye to my changes.

jdev082 commented 2 years ago

Moving to Catalyst anyway...