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';
66import HeroWithLogo from '../../../components/Hero/HeroWithLogo' ;
77import ButtonComponent from '../../../components/Button/ButtonComponent' ;
88
9- import HeroWithLogo from '../../../components/Hero/HeroWithLogo' ;
10- import ButtonComponent from '../../../components/Button/ButtonComponent' ;
11-
129import { login } from 'src/actions/accountActions' ;
1310import { useDispatch , useSelector } from 'react-redux' ;
1411
Original file line number Diff line number Diff line change @@ -11,23 +11,31 @@ function Hero({ className, ...rest }) {
1111 return (
1212 < div className = { className } { ...rest } >
1313 < HeroWithLogo
14+ << << << < HEAD
1415<< << << < HEAD
1516 style = { { height : '420px' } }
1617= === ===
1718 style = { { height : "420px" } }
1819> >>> >>> fixed pixel perfect things
20+ === === =
21+ style = { { height : '420px' } }
22+ >>> >>> > fixed netlify build with removing all unused variables
1923 title = "Learn for Cause "
2024 title2 = "Code for Cause "
2125 imageUrl = "/static/home/codeforcause.svg"
2226 firstComponent = {
2327< << < << < HEAD
28+ << << < << HEAD
29+ === = ===
30+ >>> > >>> fixed netlify build with removing all unused variables
2431 < >
2532 < Typography variant = "body1" >
2633 An initiative to help the community by providing training,
2734 guidance and awareness about the possibilities in the software
2835 field to students & professionals .
2936 < / T y p o g r a p h y >
3037 < div style = { { height : '16px' } } > </ div >
38+ << < << << HEAD
3139=== = ===
3240 < > < Typography variant = "body1" >
3341 An initiative to help the community by providing training, guidance
@@ -36,6 +44,8 @@ function Hero({ className, ...rest }) {
3644 < / T y p o g r a p h y >
3745 < div style = { { height :"16px" } } > </ div >
3846>>> > >>> fixed pixel perfect things
47+ === = ===
48+ >>> > >>> fixed netlify build with removing all unused variables
3949 < / >
4050 }
4151 secondComponent = {
You can’t perform that action at this time.
0 commit comments