Merge pull request #12 from scttdavs/fix-conflict

Fix conflict with `microsoft_graph` Fixes #9
synth · Mar 9, 2019 · adec395 · adec395
2 parents 1216ca4 + 2792a7d
commit adec395
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -27,7 +27,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-
 ## Contributing
 
 1. Fork it ( https://github.com/synth/omniauth-microsoft_graph/fork )

diff --git a/lib/microsoft_graph.rb → lib/omniauth_microsoft_graph.rb b/lib/microsoft_graph.rb → lib/omniauth_microsoft_graph.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do @@
     end
     ```
     ## Contributing
 . Fork it ( https://github.com/synth/omniauth-microsoft_graph/fork )
@@ Expand Down @@