Resolve "make friendly example scripts for the release"
Compare changes
Files
26
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -7,16 +7,15 @@
@@ -25,7 +24,8 @@ __all__ = [