update MMM-Lunartic fails ..

[Stoffbeuteluwe]

patrickhahn@Patricks-Mini MMM-Lunartic % git pull
Updating c977e14..5cc2c3b
error: Your local changes to the following files would be overwritten by merge:
	MMM-Lunartic.js
Please commit your changes or stash them before you merge.
Aborting

don’t know how to do the update
thanks in advance

[sdetweil]

@Stoffbeuteluwe did u edit the js file?

[Stoffbeuteluwe]

@sdetweil oh thanks Sam now I remember…I have change the file because of the api for having a temporary fix.
Thanks now I know my problem…