Skip to content

Commit 9c71bb8

Browse files
accepted change
1 parent 76b0688 commit 9c71bb8

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

src/components/Medium/Medium.js

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,37 +19,11 @@ class Medium extends React.Component {
1919
}
2020
};
2121
componentDidMount() {
22-
<<<<<<< HEAD
23-
// this.fetchBlogs()
24-
=======
2522
this.fetchBlogs();
26-
>>>>>>> 5f39e11a78b2020372b1e618c95d41be694b7e18
2723
}
2824

2925
render() {
3026
return (
31-
<<<<<<< HEAD
32-
<div className="container" style={{ width: "100%", alignContent: "left" }}>
33-
<h1 className="component-heading">Latest Blogs</h1>
34-
<div
35-
className="row justify-content-center Medium"
36-
style={{ textAlign: "left" }}
37-
>
38-
{/*this.state.posts.map((post, index) => (
39-
<div className="col-md-4 Medium-post" key={index}>
40-
<a class="outer-link" href={post.link[0]}>
41-
<div>
42-
{ ReactHtmlParser(post["content:encoded"][0]) }
43-
</div>
44-
<div className="fading-box">
45-
<div className="view-more">View More</div>
46-
</div>
47-
</a>
48-
</div>
49-
))*/}
50-
</div>
51-
</div>
52-
=======
5327
<React.Fragment>
5428
<Row className="medium-post-container">
5529
{this.state.posts.map((post, index) => (
@@ -66,7 +40,6 @@ class Medium extends React.Component {
6640
))}
6741
</Row>
6842
</React.Fragment>
69-
>>>>>>> 5f39e11a78b2020372b1e618c95d41be694b7e18
7043
);
7144
}
7245
}

0 commit comments

Comments
 (0)