adding tech restoration to snapshot
fixing restore snapshot
Revert "adding tech restoration to snapshot"

This reverts commit e7c14b34781742dc6a7ed41234ea1e7f9fa18c9e.
merging flashfix
updating video.js version for currentType dependency
Merge remote-tracking branch 'main/master'

* main/master:
  Rely on player.ended() to prevent replay after postrolls.
  use notices on irc
  0.2.1
  increase selector specificity

Conflicts:
	src/videojs.ads.js
fixing restoreSnapshot unchanged src conditional
Merge branch 'master' of github.com:videojs/videojs-contrib-ads

* 'master' of github.com:videojs/videojs-contrib-ads:
  Handle snapshots directly before and after ad playback Instead of taking the player snapshot some of the transitions before entering ad-playback and restoring the snapshot in another set, tie the management of the player snapshot directly to the ad-playback state. This issue arose when contentupdate was fired for a video that had already played a preroll and and the ad response for the next video timed out. Since the snapshot was restored moving into ads-timeout-playback and no new snapshot had been taken at contentupdate, the original video was restored. Now, moving to ads-timeout-playback does not restore a player snapshot and snapshot handling is much more localized to the ad-playback state.
  Add missing fields Put the project repository and a description into the package.json.
Merge branch 'cross-tech-safari-fix' of github.com:guardian/videojs-contrib-ads into guardian-cross-tech-safari-fix
Add test case for snapshot restore with blocked ads
Clean up some distracting error messages during the ad tests. Add a test that checks to make sure the src attribute is restored if currentSrc never gets changed. Worked around an issue with error events and bad poster images in video.js error handling (videojs/video.js#1465).
Whitespace fix
Clean up empty lines.
Add a lot of comments to video element source restoration
Expand out the conditionals and add comments around the decision to restore the video source or not. The logic is intended to be identical.
Merge branch 'guardian-cross-tech-safari-fix'