Skip to content
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.

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

Adicionado .prettierrc e consertada formatação dos arquivos #125

Merged
merged 4 commits into from
Oct 7, 2019

Conversation

estacioneto
Copy link
Contributor

Descrição do bug/feature:

Adicionado arquivo .prettierrc e consertada formatação de arquivos .js

Solução adotada:

Após adição do arquivo, foi rodado o comando prettier (instalado globalmente em minha máquina pois ainda não sei se é necessário adicionar ao projeto).

@thayannevls
Copy link
Contributor

Oi @estacioneto! Obrigada pela contribuição, ficou ótimo já.

Na verdade queremos sim o prettier no projeto, então pode adicionar nas dependências 😄

@thayannevls thayannevls self-requested a review October 5, 2019 00:16
fanny
fanny previously approved these changes Oct 5, 2019
thayannevls
thayannevls previously approved these changes Oct 5, 2019
Copy link
Contributor

@thayannevls thayannevls left a comment

Choose a reason for hiding this comment

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

Obrigada pela contribuição Estácio! ❤️

Resolve os conflitos que eu dou merge 😄

@@ -0,0 +1,119 @@
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

js.orig? 🤔
Pode apagar?

@@ -0,0 +1,64 @@
<<<<<<< HEAD
import React from 'react';
Copy link
Contributor

Choose a reason for hiding this comment

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

aqui tb

@@ -0,0 +1,64 @@
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

BACKUP? 🤔

@@ -0,0 +1,36 @@
import React, {Component} from "react";
Copy link
Contributor

Choose a reason for hiding this comment

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

BASE?

@@ -0,0 +1,31 @@
import React from 'react';
Copy link
Contributor

Choose a reason for hiding this comment

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

LOCAL?

@@ -0,0 +1,37 @@
import React, { Component } from 'react';
Copy link
Contributor

Choose a reason for hiding this comment

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

REMOTE?

@estacioneto
Copy link
Contributor Author

Valeu, @fanny! Não tinha visto... Sorry :/

@fanny fanny merged commit 578903d into OpenDevUFCG:master Oct 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants