Skip to content

Task1 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

ValeriyaRipyanchina wants to merge 2 commits into javascript-tutorial:master

from ValeriyaRipyanchina:task1

Open

Task1 #37

Changes from all commits

Commits

Show all changes

Select commit Hold shift + click to select a range

ValeriyaRipyanchina May 26, 2021

ValeriyaRipyanchina May 26, 2021

File filter

Filter by extension

Conversations

Jump to

Jump to file

Failed to load files.

Loading

Diff view

Diff view

8 changes: 8 additions & 0 deletions .idea/.gitignore

Show comments View file Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Show comments View file Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/project.iml

Show comments View file Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Show comments View file Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 22 additions & 4 deletions my.html

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -1,7 +1,25 @@
	<!doctype html>
	<title>Welcome to Git!</title>
	<!DOCTYPE HTML>
	<html>
	<head>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
	</head>
	<body>

	<h1>Решение первой задачи</h1>
	function sum1(a, b){
	return a + b;
	}
	console.log(sum1(1,1));

	function sum2(c, d){
	return c + d;
	}
	console.log(sum2(2,5));
	</body>
	</html>




	<p>Let's have some fun!</p>

	<p>New changes!</p>

24 changes: 24 additions & 0 deletions script.js

Show comments View file Open in desktop

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,24 @@
	<!DOCTYPE HTML>
	<html>
	<head>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
	</head>
	<body>

	<h1> Решение первой задачи</h1>
	function sum1(a, b){
	return a + b;
	}
	console.log(sum1(1,1));

	function sum2(c, d){
	return c + d;
	}
	console.log(sum2(2,5));

	<h2> Решение первой задачи</h2>
	</body>
	</html>