app/views/tournaments/featured/wsop.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wsop.html.erb
app/views/tournaments/featured/wsop.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wsop.html.erb
app/views/tournaments/featured/wsop.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wsop.html.erb
app/views/tournaments/featured/wsop.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wsop.html.erb
app/views/tournaments/featured/wpt.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wpt.html.erb
app/views/tournaments/featured/wpt.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wpt.html.erb
app/views/tournaments/featured/wpt.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/wpt.html.erb
app/views/tournaments/featured/ept.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/ept.html.erb
app/views/tournaments/featured/ept.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/ept.html.erb
app/views/tournaments/featured/ept.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/ept.html.erb
app/views/tournaments/featured/ept.html.erb:<<<<<<< HEAD:app/views/tournaments/featured/ept.html.erb
app/views/content/rules_buttons_and_blinds.html.erb:<<<<<<< HEAD:app/views/content/rules_buttons_and_blinds.html.erb
app/views/content/rules_buttons_and_blinds.html.erb:<<<<<<< HEAD:app/views/content/rules_buttons_and_blinds.html.erb
app/views/content/rules_general.html.erb:<<<<<<< HEAD:app/views/content/rules_general.html.erb
app/views/content/rules_hand_rankings.html.erb:<<<<<<< HEAD:app/views/content/rules_hand_rankings.html.erb
app/views/content/rules_hand_rankings.html.erb:<<<<<<< HEAD:app/views/content/rules_hand_rankings.html.erb
app/views/content/rules_how_to_play_poker.html.erb:<<<<<<< HEAD:app/views/content/rules_how_to_play_poker.html.erb
app/views/content/rules_tournaments.html.erb:<<<<<<< HEAD:app/views/content/rules_tournaments.html.erb
app/views/content/rules_tournaments.html.erb:<<<<<<< HEAD:app/views/content/rules_tournaments.html.erb
app/views/content/rules_kill_pots.html.erb:<<<<<<< HEAD:app/views/content/rules_kill_pots.html.erb
app/views/content/rules_kill_pots.html.erb:<<<<<<< HEAD:app/views/content/rules_kill_pots.html.erb
app/views/strategy/index.html.erb:<<<<<<< HEAD:app/views/strategy/index.html.erb
app/views/strategy/index.html.erb:<<<<<<< HEAD:app/views/strategy/index.html.erb