Modern Front End for Rails - Source code in "server" directory is altered

Community PragProg Customers
1

Hello,

In the folder server/02/app/views/schedules/ the show.html.erb contains what it seems to be strings related to git:

                  <div class="has-text-grey has-text-weight-bold">
                    <%= concert.venue.name %>
                  </div>
                </div>
                <<<<<<< HEAD

                <div class="column is-size-4 is-one-fifth"
                     data-sold-out-concert-target="label">
                  On Sale
                </div>
                =======
                <div class="column is-size-4 is-one-fifth">On Sale</div>
                >>>>>>> css_03
              </div>
            </article>
          <% end %>

Some other files are affected too.

3 Likes
2

If you are asking how to get the code working: it’s usually safe to pick the code between <<<<<<< HEAD and =======. Delete the code between ======= and >>>>>>> css_03 and you should have a working version in the meantime.

If you are asking the book’s writers to fix the repo: I am not one of them.

3 Likes
3

Sorry, this will get fixed on my next pass through the code.

Thanks,

Noel

2 Likes