Fix merge conflict and wipe credentials

DevJav / best_friend_lamp_arduino

Best friend lamp project made with Arduino

15 stars 5 forks source link

Fix merge conflict and wipe credentials #1

Closed JSchrepp closed 2 years ago

JSchrepp commented 2 years ago

Looks like you committed an unresolved merge conflict. Additionally, that conflict had credentials on one branch. This resolves the merge, keeping the empty creds to be filled in by others. I recommend you rotate your key after merging this.

DevJav commented 2 years ago

Thank you! I didn't notice.

Don't worry about the key, I already changed it.