Remove unnecessary file publisher.cc.rej was a merge conflict resolution file created by git which accidentally got committed. Removing... Change-Id: I090b0ef8f596d009bf61488266f9b3a8e7c3d6d0
diff --git a/libweave/src/privet/publisher.cc.rej b/libweave/src/privet/publisher.cc.rej deleted file mode 100644 index 6b84196..0000000 --- a/libweave/src/privet/publisher.cc.rej +++ /dev/null
@@ -1,16 +0,0 @@ -diff a/libweave/src/privet/publisher.cc b/libweave/src/privet/publisher.cc (rejected hunks) -@@ -82,10 +82,14 @@ void Publisher::ExposeService() { - if (!cloud_->GetDescription().empty()) - txt_record.emplace("note", cloud_->GetDescription()); - -+ is_publishing_ = true; - mdns_->PublishService(kPrivetServiceId, port, txt_record); - } - - void Publisher::RemoveService() { -+ if (!is_publishing_) -+ return; -+ is_publishing_ = false; - VLOG(1) << "Stopping service publishing."; - mdns_->StopPublishing(kPrivetServiceId); - }