QuinnyPig/conflicts QuinnyPig/conflicts

  • Stars
    star
    9
  • Rank 1,939,727 (Top 39 %)
  • Language
  • Created over 10 years ago
  • Updated over 12 years ago
Twitter logo Share LinkedIn logo Share Facebook logo Share
QuinnyPig/conflicts
github

QuinnyPig

Reviews

There are no reviews yet. Be the first to send feedback to the community and the maintainers!

Repository Details

Some sample merge conflicts

More Repositories

1

tailscale-layer

Shell
142
star
2

pinboard-backup

This backs up Pinboard bookmarks to DynamoDB.
Python
18
star
3

zcam-controller

A binary to control the Z-Cam line of cameras via API
Go
14
star
4

OpenVZ-Template-Creators

These scripts build containers for Ubuntu and other distributions to serve as OpenVZ templates. They're also suitably named for use in ProxMox VE.
11
star
5

expand-ebs-root-volume

Expands an EC2 instance's root volume. Requires instance downtime.
Shell
6
star
6

lambda-headers

Lambda function to inject custom headers into CloudFront responses.
JavaScript
4
star
7

Dotfiles

Dotfiles for my .bashrc and whatnot. Probably not interesting to anyone else.
1
star
8

destroy-after-reading

Python
1
star
9

vigilant-couscous

1
star
10

shitposting.pictures

An S3 bucket with CloudFront distribution to store screenshots
Python
1
star
11

try_git

1
star