merge fixups

- fix bad rebase on doc_page.rb - remove redundant github action for running tests
railsbridge-boston · Nov 3, 2023 · 3f17f5f · 3f17f5f
1 parent 4fbb1ad
commit 3f17f5f
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 38 deletions.
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
diff --git a/lib/doc_page.rb b/lib/doc_page.rb
@@ -41,11 +41,7 @@ def file_name
   end
 
   def git_url
-<<<<<<< HEAD
-    "https://github.com/railsbridge/docs/blob/master/sites/#{site.name}/#{file_name}"
-=======
     "https://github.com/railsbridge-boston/docs/blob/master/sites/#{@locale}/#{site.name}/#{file_name}"
->>>>>>> 737f14f (boston chapter specific tweaks to codebase)
   end
 
   def src_url