self merge conflicts are fun

2026-03-05 14:40:53 -05:00
parent b5a1517330
commit 8ecabf60ff
4 changed files with 8 additions and 9 deletions
@@ -1,7 +1,7 @@
 class IdCard::SetupController < ApplicationController

  def new
-    @employer = Employer.find_by(slug: params[:id])
+    @employer = Employer.find_by(slug: params[:employer])
    @setup = @employer.id_card_setup.new
    render :new
  end