localgovdrupal / localgov_subsites

Replaces LocalGov Campaigns with a new name and extended functionality to support subsites within LocalGov Drupal installations.
GNU General Public License v2.0
4 stars 2 forks source link

Viewsreference patch conflict with localgov_paragraphs #100

Closed graham-web closed 2 years ago

graham-web commented 2 years ago

I'm currently seeing the following output from composer since updating everything today:

Since https://github.com/localgovdrupal/localgov_paragraphs/commit/ee0032ad0cf64be0030b8fc7cd98e03b1fd82acb was committed, there are now two competing versions of the same patch for viewsreference in my LGD install!

ekes commented 2 years ago

Can you do a quick grep to see where the 2020-07-16/2957529-10.viewsreference.patch is coming from? I've just done one on my codebase and it's not coming up; and a github search of the repos isn't being very helpful for either.

graham-web commented 2 years ago

@ekes Sorry, should have made that clearer! https://github.com/localgovdrupal/localgov_subsites/blob/fea2c2678310396b7ebbdaf65b01ead8516a84d1/composer.json#L23