fix: fixes conflicts

karlasamantha · karlasamantha · commit 4d4df64abb32 · 2023-01-26T13:15:08.000-08:00
diff --git a/7-animation/3-js-animation/article.md b/7-animation/3-js-animation/article.md
@@ -283,7 +283,7 @@ A função `bounce` faz o mesmo, mas em ordem reversa: o "quique" começa imedia
 
 ```js
 function bounce(timeFraction) {
-  for (let a = 0, b = 1, result; 1; a += b, b /= 2) {
+  for (let a = 0, b = 1; 1; a += b, b /= 2) {
     if (timeFraction >= (7 - 4 * a) / 11) {
       return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)
     }

Original file line number	Diff line number	Diff line change
@@ -283,7 +283,7 @@ A função `bounce` faz o mesmo, mas em ordem reversa: o "quique" começa imedia
`283`	`283`
`284`	`284`	```js
`285`	`285`	`function bounce(timeFraction) {`
`286`		`- for (let a = 0, b = 1, result; 1; a += b, b /= 2) {`
	`286`	`+ for (let a = 0, b = 1; 1; a += b, b /= 2) {`
`287`	`287`	`if (timeFraction >= (7 - 4 * a) / 11) {`
`288`	`288`	`return -Math.pow((11 - 6 * a - 11 * timeFraction) / 4, 2) + Math.pow(b, 2)`
`289`	`289`	`}`