merge: merge main into development_fix keeping development_fix versions
- Keep all development_fix build artifacts and configurations - Resolve conflicts by preferring development_fix versions - Maintain existing development_fix branch functionality
This commit is contained in:
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"version": 3,
|
||||
"middleware": {},
|
||||
"functions": {},
|
||||
"sortedMiddleware": []
|
||||
}
|
Reference in New Issue
Block a user