Skip to content

Commit

Permalink
testing ci 2 after unknown error?...i
Browse files Browse the repository at this point in the history
  • Loading branch information
@alicehgsun
alicehgsun committed Oct 7, 2018
1 parent 7c20c05 commit 3f3f9e8
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions package.json
View file
Expand Up @@ -16,11 +16,7 @@
"author": "Daniel Shiffman",
"license": "MIT",
"devDependencies": {
<<<<<<< HEAD
"jest": "^22.4.4"
=======
"jest": "^22.1.4"
>>>>>>> 2b59986da55a020a3f46212c545d37d6ecc6e4e1
},
"dependencies": {
"node-fetch": "^2.2.0",
Expand Down

2 comments on commit 3f3f9e8

@shiffman
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this is some automatic markup that git adds when there is a merge conflict! (We can look at this together on Tuesday if you like, I am scheduling an extra help session which you'll get an e-mail about soon!)

@alicehgsun
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll look into the help session email. Thank you!

Please sign in to comment.