search

Strum / Strums_Mental_VCV_Modules

Strum's Mental Modules for VCV Rack
BSD 3-Clause "New" or "Revised" License
63 stars 15 forks source link

Merge issues with latest commit #40

Closed cschol closed 6 years ago

cschol commented 6 years ago

@Strum Looks like, your last commit changing the backgrounds has a ton of merge issues:

https://github.com/Strum/Strums_Mental_VCV_Modules/commit/67fd00ff1d7251951825cfc5ede53d09621a72f1

strum_merge_issues

Strum commented 6 years ago

yeah sorry, I messed something up with git and it merged the changes instead of overwriting the old files.

bugger

will copy the old ones back over.

cschol commented 6 years ago

Great, thank you!

cschol commented 6 years ago

Please let me know when this is completed in the Rack Repair Thread. Thanks!

Strum commented 6 years ago

@cschol yeah, sorry , been busy with other things. will sort out today.

Strum commented 6 years ago

@cschol

I think it's fixed now.

cschol commented 6 years ago

Perfect. Works great. Thank you!