Resolve merge conflict in .gitignore

Combined Bitbucket template with Python-specific patterns for comprehensive
file exclusion coverage.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

.gitignore

@@ -1,3 +1,6 @@
+# Meta File Server Query Application - Git Ignore File
+# Combined from Bitbucket template and Python-specific patterns
+
 # Python
 __pycache__/
 *.py[cod]
@@ -29,6 +32,15 @@ venv/
 env/
 ENV/
 
+# Flask
+instance/
+.webassets-cache
+
+# Environment variables
+.env
+.env.local
+.env.production
+
 # IDE
 .vscode/
 .idea/
@@ -36,7 +48,7 @@ ENV/
 *.swo
 *~
 
-# OS
+# OS Files
 .DS_Store
 .DS_Store?
 ._*
@@ -48,15 +60,34 @@ Thumbs.db
 # Logs
 *.log
 
-# Flask
-instance/
-.webassets-cache
-
-# Environment variables
-.env
-.env.local
-.env.production
-
 # Temporary files
 *.tmp
-*.temp
+*.temp
+
+# Node artifact files (if applicable)
+node_modules/
+
+# Compiled Java class files
+*.class
+
+# Package files
+*.jar
+
+# Maven
+target/
+
+# Unit test reports
+TEST*.xml
+
+# Applications
+*.app
+*.exe
+*.war
+
+# Large media files
+*.mp4
+*.tiff
+*.avi
+*.flv
+*.mov
+*.wmv