This repository was archived by the owner on Mar 7, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Expand file tree Collapse file tree 2 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -6,9 +6,6 @@ import { Typography } from '@material-ui/core';
6
6
import HeroWithLogo from '../../../components/Hero/HeroWithLogo' ;
7
7
import ButtonComponent from '../../../components/Button/ButtonComponent' ;
8
8
9
- import HeroWithLogo from '../../../components/Hero/HeroWithLogo' ;
10
- import ButtonComponent from '../../../components/Button/ButtonComponent' ;
11
-
12
9
import { login } from 'src/actions/accountActions' ;
13
10
import { useDispatch , useSelector } from 'react-redux' ;
14
11
Original file line number Diff line number Diff line change @@ -11,23 +11,31 @@ function Hero({ className, ...rest }) {
11
11
return (
12
12
< div className = { className } { ...rest } >
13
13
< HeroWithLogo
14
+ << << << < HEAD
14
15
<< << << < HEAD
15
16
style = { { height : '420px' } }
16
17
= === ===
17
18
style = { { height : "420px" } }
18
19
> >>> >>> fixed pixel perfect things
20
+ === === =
21
+ style = { { height : '420px' } }
22
+ >>> >>> > fixed netlify build with removing all unused variables
19
23
title = "Learn for Cause "
20
24
title2 = "Code for Cause "
21
25
imageUrl = "/static/home/codeforcause.svg"
22
26
firstComponent = {
23
27
< << < << < HEAD
28
+ << << < << HEAD
29
+ === = ===
30
+ >>> > >>> fixed netlify build with removing all unused variables
24
31
< >
25
32
< Typography variant = "body1" >
26
33
An initiative to help the community by providing training,
27
34
guidance and awareness about the possibilities in the software
28
35
field to students & professionals .
29
36
< / T y p o g r a p h y >
30
37
< div style = { { height : '16px' } } > </ div >
38
+ << < << << HEAD
31
39
=== = ===
32
40
< > < Typography variant = "body1" >
33
41
An initiative to help the community by providing training, guidance
@@ -36,6 +44,8 @@ function Hero({ className, ...rest }) {
36
44
< / T y p o g r a p h y >
37
45
< div style = { { height :"16px" } } > </ div >
38
46
>>> > >>> fixed pixel perfect things
47
+ === = ===
48
+ >>> > >>> fixed netlify build with removing all unused variables
39
49
< / >
40
50
}
41
51
secondComponent = {
You can’t perform that action at this time.
0 commit comments