Kourtney Lee klee1611

Buy Me a Coffee

Using inlined HTML

<a href="https://www.buymeacoffee.com/gbraad" target="_blank"><img src="https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png" alt="Buy Me A Coffee" style="height: 41px !important;width: 174px !important;box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 3px 2px 0px rgba(190, 190, 190, 0.5) !important;" ></a>

How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

Update the master branch with the latest changes:
```
git checkout master
git pull
```
Merge your feature branch into master:

	{
	"anuppuccin-theme-settings@@anuppuccin-theme-light": "ctp-rosepine-light",
	"anuppuccin-theme-settings@@anuppuccin-theme-dark": "ctp-mocha",
	"anuppuccin-theme-settings@@anuppuccin-accent-toggle": true,
	"anuppuccin-theme-settings@@anuppuccin-theme-accents": "ctp-accent-rosewater",
	"anuppuccin-theme-settings@@anp-colorful-frame-opacity": 1,
	"anuppuccin-theme-settings@@anp-colorful-frame-color@@dark": "#43BFBA",
	"anuppuccin-theme-settings@@anp-colorful-frame-color@@light": "#74B7C4",
	"anuppuccin-theme-settings@@anp-callout-toggle": true,
	"anuppuccin-theme-settings@@anp-callout-select": "anp-callout-default",

	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
	; OSX style keys;
	; Taking from post: https://www.autohotkey.com/board/topic/60675-osx-style-command-keys-in-windows/
	;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

	; CapsLock switch language
	CapsLock::Send, {Alt Down}{Shift Down}{Shift Up}{Alt Up}

	;Command-backspace deletes whole line
	#BS::Send {LShift down}{Home}{LShift Up}{Del}

	#!/usr/bin/env bash
	DB_FILE=$1
	TABLE=$2

	if [ -z "$DB_FILE" ] \|\| [ -z "$TABLE" ]; then
	echo "Usage: $0 <db_file> <table>"
	exit 1
	fi

	sqlite3 $DB_FILE <<EOF

	class bcolors:
	HEADER = '\033[95m'
	OKBLUE = '\033[94m'
	OKCYAN = '\033[96m'
	OKGREEN = '\033[92m'
	WARNING = '\033[93m'
	FAIL = '\033[91m'
	ENDC = '\033[0m'
	BOLD = '\033[1m'
	UNDERLINE = '\033[4m'

	#!/usr/bin/env bash

	curl -O https://bootstrap.pypa.io/ez_setup.py
	python3 ez_setup.py
	curl -O https://bootstrap.pypa.io/get-pip.py
	python3 get-pip.py

	# Translations for Traditional Chinese
	# https://gohugo.io/content-management/multilingual/#translation-of-strings

	# === baseof ==
	[backToTop]
	other = "回到頂端"

	[viewComments]
	other = "查看評論"
	# === baseof ==

	# 0 is too far from ` ;)
	set -g base-index 1

	# Automatically set window title
	set-window-option -g automatic-rename on
	set-option -g set-titles on

	#set -g default-terminal screen-256color
	set -g status-keys vi
	set -g history-limit 10000