-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resolved merge conflict in README.md
- Loading branch information
Showing
51 changed files
with
156,892 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 37899dd5f56369b65b33be470fd54424 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,6 @@ | ||
| <<<<<<< HEAD | ||
| # asifjahan1.github.io | ||
| My First Portfolio Website. | ||
| ======= | ||
| # asifjahan1.github.io | ||
| >>>>>>> adc380d918202f859187dae3f09af228355a2a90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| "DRUHJmFzc2V0cy9mb250cy9tb250c2VycmF0L21vbnRzZXJyYXQudHRmDAENAQcFYXNzZXQHJmFzc2V0cy9mb250cy9tb250c2VycmF0L21vbnRzZXJyYXQudHRmByVhc3NldHMvZm9udHMvcG9wcGlucy9Qb3BwaW5zLUJvbGQudHRmDAENAQcFYXNzZXQHJWFzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtQm9sZC50dGYHJ2Fzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtSXRhbGljLnR0ZgwBDQEHBWFzc2V0Bydhc3NldHMvZm9udHMvcG9wcGlucy9Qb3BwaW5zLUl0YWxpYy50dGYHJmFzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtTGlnaHQudHRmDAENAQcFYXNzZXQHJmFzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtTGlnaHQudHRmBydhc3NldHMvZm9udHMvcG9wcGlucy9Qb3BwaW5zLU1lZGl1bS50dGYMAQ0BBwVhc3NldAcnYXNzZXRzL2ZvbnRzL3BvcHBpbnMvUG9wcGlucy1NZWRpdW0udHRmByhhc3NldHMvZm9udHMvcG9wcGlucy9Qb3BwaW5zLVJlZ3VsYXIudHRmDAENAQcFYXNzZXQHKGFzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtUmVndWxhci50dGYHKWFzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtU2VtaUJvbGQudHRmDAENAQcFYXNzZXQHKWFzc2V0cy9mb250cy9wb3BwaW5zL1BvcHBpbnMtU2VtaUJvbGQudHRmBxFhc3NldHMvZ2lmL2hpLmdpZgwBDQEHBWFzc2V0BxFhc3NldHMvZ2lmL2hpLmdpZgcYYXNzZXRzL2ljb25zL2FuZHJvaWQuc3ZnDAENAQcFYXNzZXQHGGFzc2V0cy9pY29ucy9hbmRyb2lkLnN2ZwcWYXNzZXRzL2ljb25zL2FwcGxlLnN2ZwwBDQEHBWFzc2V0BxZhc3NldHMvaWNvbnMvYXBwbGUuc3ZnBxhhc3NldHMvaWNvbnMvZ3JhcGhpYy5zdmcMAQ0BBwVhc3NldAcYYXNzZXRzL2ljb25zL2dyYXBoaWMuc3ZnBxhhc3NldHMvaWNvbnMvd2Vic2l0ZS5zdmcMAQ0BBwVhc3NldAcYYXNzZXRzL2ljb25zL3dlYnNpdGUuc3ZnBxJhc3NldHMvaW1ncy8wMi5wbmcMAQ0BBwVhc3NldAcSYXNzZXRzL2ltZ3MvMDIucG5nBxJhc3NldHMvaW1ncy8wMy5wbmcMAQ0BBwVhc3NldAcSYXNzZXRzL2ltZ3MvMDMucG5nBxJhc3NldHMvaW1ncy8wNC5wbmcMAQ0BBwVhc3NldAcSYXNzZXRzL2ltZ3MvMDQucG5nBxFhc3NldHMvaW1ncy8xLnBuZwwBDQEHBWFzc2V0BxFhc3NldHMvaW1ncy8xLnBuZwcXYXNzZXRzL2ltZ3MvNTQyNDQ4Mi5qcGcMAQ0BBwVhc3NldAcXYXNzZXRzL2ltZ3MvNTQyNDQ4Mi5qcGcHFGFzc2V0cy9pbWdzL0JHMDEucG5nDAENAQcFYXNzZXQHFGFzc2V0cy9pbWdzL0JHMDEucG5nBxhhc3NldHMvaW1ncy9JTUdfMDEwNy5wbmcMAQ0BBwVhc3NldAcYYXNzZXRzL2ltZ3MvSU1HXzAxMDcucG5nBxdhc3NldHMvaW1ncy9mbHV0dGVyLnBuZwwBDQEHBWFzc2V0Bxdhc3NldHMvaW1ncy9mbHV0dGVyLnBuZwcycGFja2FnZXMvY3VwZXJ0aW5vX2ljb25zL2Fzc2V0cy9DdXBlcnRpbm9JY29ucy50dGYMAQ0BBwVhc3NldAcycGFja2FnZXMvY3VwZXJ0aW5vX2ljb25zL2Fzc2V0cy9DdXBlcnRpbm9JY29ucy50dGY=" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"assets/fonts/montserrat/montserrat.ttf":["assets/fonts/montserrat/montserrat.ttf"],"assets/fonts/poppins/Poppins-Bold.ttf":["assets/fonts/poppins/Poppins-Bold.ttf"],"assets/fonts/poppins/Poppins-Italic.ttf":["assets/fonts/poppins/Poppins-Italic.ttf"],"assets/fonts/poppins/Poppins-Light.ttf":["assets/fonts/poppins/Poppins-Light.ttf"],"assets/fonts/poppins/Poppins-Medium.ttf":["assets/fonts/poppins/Poppins-Medium.ttf"],"assets/fonts/poppins/Poppins-Regular.ttf":["assets/fonts/poppins/Poppins-Regular.ttf"],"assets/fonts/poppins/Poppins-SemiBold.ttf":["assets/fonts/poppins/Poppins-SemiBold.ttf"],"assets/gif/hi.gif":["assets/gif/hi.gif"],"assets/icons/android.svg":["assets/icons/android.svg"],"assets/icons/apple.svg":["assets/icons/apple.svg"],"assets/icons/graphic.svg":["assets/icons/graphic.svg"],"assets/icons/website.svg":["assets/icons/website.svg"],"assets/imgs/02.png":["assets/imgs/02.png"],"assets/imgs/03.png":["assets/imgs/03.png"],"assets/imgs/04.png":["assets/imgs/04.png"],"assets/imgs/1.png":["assets/imgs/1.png"],"assets/imgs/5424482.jpg":["assets/imgs/5424482.jpg"],"assets/imgs/BG01.png":["assets/imgs/BG01.png"],"assets/imgs/IMG_0107.png":["assets/imgs/IMG_0107.png"],"assets/imgs/flutter.png":["assets/imgs/flutter.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| [{"family":"MaterialIcons","fonts":[{"asset":"fonts/MaterialIcons-Regular.otf"}]},{"family":"Montserrat","fonts":[{"asset":"assets/fonts/montserrat/montserrat.ttf"}]},{"family":"Poppins","fonts":[{"asset":"assets/fonts/poppins/Poppins-Regular.ttf"},{"asset":"assets/fonts/poppins/Poppins-Light.ttf"},{"weight":900,"asset":"assets/fonts/poppins/Poppins-Bold.ttf"},{"weight":300,"asset":"assets/fonts/poppins/Poppins-Medium.ttf"},{"weight":500,"asset":"assets/fonts/poppins/Poppins-SemiBold.ttf"},{"style":"italic","asset":"assets/fonts/poppins/Poppins-Italic.ttf"}]},{"family":"packages/cupertino_icons/CupertinoIcons","fonts":[{"asset":"packages/cupertino_icons/assets/CupertinoIcons.ttf"}]}] |
Oops, something went wrong.