Skip to content

Conversation

erickok
Copy link
Contributor

@erickok erickok commented Jan 5, 2022

No description provided.

tneotia and others added 18 commits May 9, 2021 08:16
…into feature/modularization

� Conflicts:
�	README.md
�	example/lib/main.dart
…into feature/modularization

� Conflicts:
�	lib/flutter_html.dart
�	lib/html_parser.dart
�	lib/src/html_elements.dart
…into feature/modularization

� Conflicts:
�	README.md
�	lib/flutter_html.dart
�	lib/html_parser.dart
�	lib/src/replaced_element.dart
…eotia/flutter_html into feature/modularization

� Conflicts:
�	README.md
�	example/lib/main.dart
�	lib/custom_render.dart
�	lib/html_parser.dart
# Conflicts:
#	README.md
#	example/lib/main.dart
#	lib/flutter_html.dart
#	lib/html_parser.dart
#	lib/image_render.dart
#	lib/src/html_elements.dart
#	lib/src/layout_element.dart
#	lib/src/replaced_element.dart
#	lib/src/utils.dart
#	lib/src/widgets/iframe_mobile.dart
#	lib/src/widgets/iframe_unsupported.dart
#	lib/src/widgets/iframe_web.dart
#	pubspec.yaml
#	test/html_parser_test.dart
…into feature/modularization

� Conflicts:
�	lib/flutter_html.dart
�	lib/html_parser.dart
�	lib/src/replaced_element.dart
�	lib/src/utils.dart
@erickok erickok merged commit d13ca75 into Sub6Resources:master Jan 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants