diff --git a/.gitignore b/.gitignore index 8a18751f3..80e85bbe3 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js /Learun.Framework.Ultimate V7/Learun.Application.Mobile/platforms/android/assets/www /Learun.Framework.Ultimate V7/Learun.Application.Mobile/www.7z /Learun.Framework.Ultimate V7/Learun.Application.WebApi/bin.7z +*.cs~merged