How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init it
$ mkdir merge-test
$ cd merge-test/
$ git init
| -- | |
| -- HAMMERSPOON CONFIG MANAGEMENT | |
| -- | |
| -- reload the config when this file changes | |
| function reloadConfig(files) | |
| doReload = false | |
| for _, file in pairs(files) do | |
| if file:sub(-4) == ".lua" then |
How to Ignore Merge Conflicts for Specific Files in a Git Repository
Create a directory and git init it
$ mkdir merge-test
$ cd merge-test/
$ git init
sudo apt-get install -y apache2
sudo a2enmod rewrite
sudo a2enmod headers
sudo apt-get install -y git
sudo apt-get install nodejs
http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/get-set-up-for-amazon-ec2.html
http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-instance_linux.html
xxx.pem with the name of your .pem file, and xxx.amazonaws.com with the public DNS name of your server, which is available on the EC2/Instances dashboard page.| from operator import itemgetter | |
| import re | |
| import sys | |
| import xml.etree.cElementTree as ET | |
| def parseXML(xml_in): | |
| ''' | |
| parse the document XML | |
| ''' |
| Consider using 'dppx' units, as in CSS 'dpi' means dots-per-CSS-inch, not dots-per-physical-inch, so does not correspond to the actual 'dpi' of a screen. In media query expression: only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min-resolution: 144dpi) (index):1 | |
| Failed to load resource: net::ERR_NETWORK_CHANGED https://slack.global.ssl.fastly.net/29047/js/rollup-client_1415507847.https.gz.js | |
| Failed to load resource: net::ERR_NETWORK_CHANGED https://fonts.googleapis.com/css?family=Lato:400,700,900,400italic,700italic,900italic | |
| Failed to load resource: net::ERR_NETWORK_CHANGED https://www.dropbox.com/static/api/1/dropins.js | |
| Failed to load resource: net::ERR_BLOCKED_BY_CLIENT https://www.google-analytics.com/analytics.js | |
| Failed to load resource: net::ERR_BLOCKED_BY_CLIENT https://slack.global.ssl.fastly.net/20653/img/services/twitter_64.png | |
| Failed to load resource: net::ERR_NETWORK_CHANGED https://slack.global.ssl.fastly.net/29046/js/libs_emoji_1415507749.https.gz.js | |
| Failed to load resource |
README is empty
| import glob | |
| from moviepy.editor import * | |
| for filename in glob.glob("./*.mov"): | |
| output_filename = './' + filename.split('/')[-1].split('.')[0] + '-resized.mov' | |
| VideoFileClip(filename).fx(vfx.rotation, 180).resize(0.3).to_videofile(output_filename, audio=False) |
| import glob | |
| from moviepy.editor import * | |
| for filename in glob.glob("./*.MOV"): | |
| output_filename = './gifs/' + filename.split('/')[-1].split('.')[0] + '.gif' | |
| VideoFileClip(filename).speedx(6.0).resize(0.14).to_gif(output_filename, fps=2) |
| application: apipemilucache | |
| version: 0-1-3 | |
| runtime: python27 | |
| api_version: 1 | |
| threadsafe: true | |
| handlers: | |
| - url: /.* | |
| script: cache.application |