Skip to content

Changes to ES6 - AT #20

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
allantito wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Changes to ES6 - AT #20

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2437af3
Changed script.js from ES5 to ES6
allanv2k Aug 7, 2017
d3daaa7
Merge pull request #1 from LambdaSchool/master
allantito Aug 7, 2017
9ff2735
Changed code to ES6 - AT
allanv2k Aug 7, 2017
d6c0149
Merge branch 'master' of https://github.com/allantito/Basic-JavaScrip…
allanv2k Aug 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
<<<<<<< HEAD
const logger = () => {
const message = 'hi';
console.log(message);
};

const looper = () => {
const message = 'I love JS!';
for (let i = 0; i < 10; i++) {
console.log(message);
}
};

const greet = (name) => {
const greeting = `Hello ${name}!`;
console.log(greeting);
=======
var logger = function() {
var message = 'hi';
console.log(message);
Expand All @@ -13,10 +30,12 @@ var looper = function() {
var greet = function(name) {
var greeting = 'Hello ' + name + '!';
console.log(greeting);
>>>>>>> d3daaa72bdd4e2667a5b7436ec9d21d4a41f2e0f
};

var yourName = 'put your name in here';
const yourName = 'Allan';

logger();
looper();
greet(yourName);