Fix error due to merges co-inciding

diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php
index eee23d27c0d0a152044f1b23ee8b122c9fcdfd78..bfe53c69506d9fa758a76899aa2df4763df370c8 100644 (file)
--- a/CRM/Event/Form/Registration/AdditionalParticipant.php
+++ b/CRM/Event/Form/Registration/AdditionalParticipant.php
@@ -66,14 +66,6 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
    */
   public $_pId;
 
-  /**
-   * Tracks whether we are at the last participant.
-   *
-   * @var bool
-   * @internal
-   */
-  public $_lastParticipant = FALSE;
-
   /**
    * Get the active UFGroups (profiles) on this form
    * Many forms load one or more UFGroups (profiles).
@@ -808,7 +800,7 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R
    * @param bool $isButtonJs
    *
    * @return bool
-   *   ture on success.
+   *   true on success.
    */
   public function isLastParticipant($isButtonJs = FALSE) {
     $participant = $isButtonJs ? $this->_params[0]['additional_participants'] : $this->_params[0]['additional_participants'] + 1;