Merge branch 'LeonarthusMectus:python-ruby-examples' into python-ruby…

…-examples
paypal-examples · Oct 17, 2024 · 2d725fc · 2d725fc
2 parents 07f387d + 4ee9000
commit 2d725fc
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -101,7 +101,6 @@ dist
 .tern-port
 
 # dotnet
-<<<<<<< HEAD
 *.sln
 
 # env