Commit 31137eb7 authored by Rafael S Castilho's avatar Rafael S Castilho

fix merge conflict

parent bec813d1
......@@ -21,7 +21,6 @@ along with Portal-SMPPIR-React. If not, see <https://www.gnu.org/licenses/>.
import React, { Component } from 'react';
import { Row, Col, Card } from 'react-materialize'
// import { Row, Col, Card, Button, Icon } from 'react-materialize'
import DropdownControl from './DropdownControl'
import { Row, Col, Card } from 'react-materialize'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment