mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-02-04 23:39:07 +07:00
0cff9f04dd
# Conflicts: # .idea/libraries/kotlinc_allopen_compiler_plugin.xml # .idea/libraries/kotlinc_analysis_api_providers.xml # .idea/libraries/kotlinc_analysis_project_structure.xml # .idea/libraries/kotlinc_android_extensions_compiler_plugin.xml # .idea/libraries/kotlinc_high_level_api.xml # .idea/libraries/kotlinc_high_level_api_fe10.xml # .idea/libraries/kotlinc_high_level_api_fir.xml # .idea/libraries/kotlinc_high_level_api_fir_tests.xml # .idea/libraries/kotlinc_high_level_api_impl_base.xml # .idea/libraries/kotlinc_high_level_api_impl_base_tests.xml # .idea/libraries/kotlinc_incremental_compilation_impl_tests.xml # .idea/libraries/kotlinc_kotlin_backend_native.xml # .idea/libraries/kotlinc_kotlin_build_common_tests.xml # .idea/libraries/kotlinc_kotlin_compiler_cli.xml # .idea/libraries/kotlinc_kotlin_compiler_common.xml # .idea/libraries/kotlinc_kotlin_compiler_fe10.xml # .idea/libraries/kotlinc_kotlin_compiler_fir.xml # .idea/libraries/kotlinc_kotlin_compiler_ir.xml # .idea/libraries/kotlinc_kotlin_compiler_tests.xml # .idea/libraries/kotlinc_kotlin_gradle_statistics.xml # .idea/libraries/kotlinc_kotlin_jps_common.xml # .idea/libraries/kotlinc_kotlin_reflect.xml # .idea/libraries/kotlinc_kotlin_script_runtime.xml # .idea/libraries/kotlinc_kotlin_scripting_common.xml # .idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml # .idea/libraries/kotlinc_kotlin_scripting_jvm.xml # .idea/libraries/kotlinc_kotlin_stdlib.xml # .idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml # .idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml # .idea/libraries/kotlinc_lombok_compiler_plugin.xml # .idea/libraries/kotlinc_low_level_api_fir.xml # .idea/libraries/kotlinc_noarg_compiler_plugin.xml # .idea/libraries/kotlinc_parcelize_compiler_plugin.xml # .idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml # .idea/libraries/kotlinc_symbol_light_classes.xml # community/.idea/libraries/kotlinc_allopen_compiler_plugin.xml # community/.idea/libraries/kotlinc_analysis_api_providers.xml # community/.idea/libraries/kotlinc_analysis_project_structure.xml # community/.idea/libraries/kotlinc_android_extensions_compiler_plugin.xml # community/.idea/libraries/kotlinc_high_level_api.xml # community/.idea/libraries/kotlinc_high_level_api_fe10.xml # community/.idea/libraries/kotlinc_high_level_api_fir.xml # community/.idea/libraries/kotlinc_high_level_api_fir_tests.xml # community/.idea/libraries/kotlinc_high_level_api_impl_base.xml # community/.idea/libraries/kotlinc_high_level_api_impl_base_tests.xml # community/.idea/libraries/kotlinc_incremental_compilation_impl_tests.xml # community/.idea/libraries/kotlinc_kotlin_build_common_tests.xml # community/.idea/libraries/kotlinc_kotlin_compiler_cli.xml # community/.idea/libraries/kotlinc_kotlin_compiler_common.xml # community/.idea/libraries/kotlinc_kotlin_compiler_fe10.xml # community/.idea/libraries/kotlinc_kotlin_compiler_fir.xml # community/.idea/libraries/kotlinc_kotlin_compiler_ir.xml # community/.idea/libraries/kotlinc_kotlin_compiler_tests.xml # community/.idea/libraries/kotlinc_kotlin_gradle_statistics.xml # community/.idea/libraries/kotlinc_kotlin_jps_common.xml # community/.idea/libraries/kotlinc_kotlin_reflect.xml # community/.idea/libraries/kotlinc_kotlin_script_runtime.xml # community/.idea/libraries/kotlinc_kotlin_scripting_common.xml # community/.idea/libraries/kotlinc_kotlin_scripting_compiler_impl.xml # community/.idea/libraries/kotlinc_kotlin_scripting_jvm.xml # community/.idea/libraries/kotlinc_kotlin_stdlib.xml # community/.idea/libraries/kotlinc_kotlin_stdlib_minimal_for_test.xml # community/.idea/libraries/kotlinc_kotlinx_serialization_compiler_plugin.xml # community/.idea/libraries/kotlinc_lombok_compiler_plugin.xml # community/.idea/libraries/kotlinc_low_level_api_fir.xml # community/.idea/libraries/kotlinc_noarg_compiler_plugin.xml # community/.idea/libraries/kotlinc_parcelize_compiler_plugin.xml # community/.idea/libraries/kotlinc_sam_with_receiver_compiler_plugin.xml # community/.idea/libraries/kotlinc_symbol_light_classes.xml # community/plugins/kotlin/fir/kotlin.fir.iml # community/plugins/kotlin/fir/test/org/jetbrains/kotlin/idea/fir/inspections/HLLocalInspectionTestGenerated.java # community/plugins/kotlin/plugin-fir/resources/META-INF/firInspections.xml # community/plugins/kotlin/plugin-fir/resources/META-INF/plugin.xml # community/plugins/kotlin/util/project-model-updater/resources/model.properties # community/plugins/kotlin/util/test-generator-fir/test/org/jetbrains/kotlin/fir/testGenerator/FirGenerateTests.kt GitOrigin-RevId: ac203db1c90d6b140db486efc02cd7512ab0f0f5