chore: resolve conflict

.gitattributes

@@ -0,0 +1 @@
+*.html linguist-detectable=false

.github/actions/spelling/allow.txt

@@ -1,11 +1,3 @@
-refactoring
-peb
-conventionalcommits
-nisamson
-bhargavh
-jerinjtitus
-Molkree
-Romi
 abhaykatheria
 ableabhinav
 accountsservice
@@ -21,6 +13,7 @@ api
 apk
 Args
 asn
+asottile
 autoescape
 autoextract
 autoextracts
@@ -32,6 +25,7 @@ bcca
 bdbd
 bdist
 bestpractices
+bhargavh
 bigbird
 binutils
 bksahu
@@ -60,6 +54,7 @@ cmdline
 codecov
 conda
 config
+conventionalcommits
 copyleft
 coreinfrastructure
 cpio
@@ -90,6 +85,7 @@ distros
 dnsmasq
 docstring
 DOCTYPE
+downloading
 dpkg
 dsa
 dtls
@@ -107,6 +103,7 @@ fedoraproject
 ffmpeg
 figcaption
 filepaths
+filetype
 filterdiv
 firefox
 freeradius
@@ -157,6 +154,7 @@ INI
 irssi
 itertools
 javascript
+jerinjtitus
 jquery
 json
 Kamdar
@@ -166,6 +164,7 @@ kexectools
 kritirikhi
 landley
 lgpl
+lgtm
 libarchive
 libbluetooth
 libbpg
@@ -183,6 +182,7 @@ libraryname
 libsndfile
 libsoup
 libsqlite
+libsrtp
 libssh
 libtiff
 libvirt
@@ -194,6 +194,7 @@ libxml
 libxslt
 lifecycle
 lighttpd
+linting
 linux
 logrotate
 lua
@@ -211,6 +212,7 @@ metadata
 microsoft
 mkdir
 modulename
+Molkree
 mozilla
 msgid
 msgstr
@@ -226,6 +228,7 @@ netpbm
 nginx
 Niraj
 nirajkamdar
+nisamson
 nitishsaini
 nlk
 noopener
@@ -252,6 +255,7 @@ pcsc
 pdf
 pdftotext
 pdxjohnny
+peb
 php
 pigz
 plotly
@@ -272,6 +276,7 @@ pypi
 pytest
 pythex
 pythonapp
+pyupgrade
 Qqe
 queryformat
 quickstart
@@ -281,8 +286,9 @@ Rahul
 readme
 readthedocs
 realpython
-downloading
+refactoring
 regex
+Romi
 rossburton
 rpmfile
 rst
@@ -295,6 +301,7 @@ sbs
 sdk
 shreyamalviya
 somefile
+sottile
 SPDX
 sqlite
 src

.github/workflows/pythonapp.yml

@@ -66,7 +66,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python: ['3.6', '3.7', '3.9', '3.10']
+        python: ['3.7', '3.9', '3.10']
     timeout-minutes: 20
     env:
       ACTIONS: 1

.github/workflows/spelling.yml

@@ -1,5 +1,5 @@
 name: Spell checking
-on: [push, pull_request_target]
+on: [push, pull_request]
 
 jobs:
   spelling:
@@ -8,3 +8,5 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: check-spelling/check-spelling@v0.0.19
+      with:
+        post_comment: '0'