Error in read.dcf() upon publishing Shiny application (that I've published before)

I have a Shiny application that I've updated and published multiple times before. After making a small change, specifically, removing a particular heading (h1), the app runs fine locally but I get the following error upon publication:

Error in read.dcf(...) : 
  Line starting '<<<<<<< Updated upst ...' is malformed!
Calls: <Anonymous> ... deployments -> -> readDcf -> read.dcf
Execution halted

This topic was automatically closed 21 days after the last reply. New replies are no longer allowed.

If you have a query related to it or one of the replies, start a new topic and refer back with a link.