김동훈 / OpenSource_Project

Go to a project
Toggle navigation Toggle navigation pinning
김다솜
d00bdbaa 2 parents 5a954ce4 3156d6d3

Conflict resolved

Inline Side-by-side
Showing 2 changed files with 7 additions and 0 deletions
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<project version="4">
3 + <component name="JavaScriptSettings">
4 + <option name="languageLevel" value="ES6" />
5 + </component>
6 +</project>
...\ No newline at end of file ...\ No newline at end of file
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 +<<<<<<< HEAD
2 <html lang="en"> 3 <html lang="en">
3 4
4 <head> 5 <head>
......