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

UmarNafeez · web-flow · commit 2d725fc4b164 · 2024-10-17T23:54:44.000+05:30
diff --git a/.gitignore b/.gitignore
@@ -101,7 +101,6 @@ dist
 .tern-port
 
 # dotnet
-<<<<<<< HEAD
 *.sln
 
 # env
