# Conflicts: # templates/js-template-default/frameworks/runtime-src/proj.android-studio/gradle.properties # templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj # templates/js-template-link/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj