David Wei shukebeta

Install Meld from their webpage http://meldmerge.org/

I had to tell git where it was:

git config --global merge.tool meld git config --global diff.tool meld

If using windows 8 and 10 use the following git config --global mergetool.meld.path "/c/Program Files (x86)/meld/meld.exe" git config --global difftool.meld.path "/c/Program Files (x86)/meld/meld.exe"

Arch Linux on Chromebook Flip C100P

The ASUS Chromebook Flip C100P (veyron_minnie) is the world's first 10" convertible Chromebook with a full metal chassis, so a user can go from laptop to tablet form factor in a snap. The ASUS Chromebook Flip is powered by a Rockchip quad-core processor with 2GB RAM for incredible performance.

It has a 10-finger multi-touch screen, with a comfortable wide key-pitch keyboard and up to 8 hours battery life for all-day mobile use. The connectivity with dual-band WiFi 802.11ac & BT4.0 support can also provide up to 3 times the speed of 802.11n for faster data transfer. Carved from a single block of aluminum for a seamless design, the ASUS Chromebook Flip is not only beautiful, but durable, too.

These instructions will create a dual-booting environment where you can switch between booting Arch Linux ARM and the stock ChromeOS. No changes are made to the internal eMMC drive, and your new Arch Linux ARM install will run completely from external storage. This is the recommen

How to setup an Outline VPN Server on Ubuntu 16.04 Server

This guide will show you how to install Outline Server on an Ubuntu 16.04 Server, use Outline Manager for Windows and connect to your Outline Server on Windows and Anroid.

Install Outline Manager

Outline Manager supports Windows, macOS and Linux.

Outline Manager for Windows

Markdown in Nginx

Nginx config

location ~ /.*\.md {
    root /www/;
    default_type text/html;
    charset UTF-8;
    add_before_body /strapdown/prepend;

add_after_body /strapdown/postpend;

How to setup an Outline VPN Server on Ubuntu 16.04 Server

This guide will show you how to install Outline Server on an Ubuntu 16.04 Server and use Outline Manager.

Install Outline Manager

Outline Manager supports Windows, macOS and Linux.

	continue
	dir=/var/www/downloads
	file-allocation=falloc
	max-connection-per-server=4
	max-concurrent-downloads=2
	max-overall-download-limit=0
	min-split-size=25M
	rpc-allow-origin-all=true
	rpc-secret=YouShouldChangeThis
	input-file=/var/tmp/aria2c.session

	// Promise.all is good for executing many promises at once
	Promise.all([
	promise1,
	promise2
	]);

	// Promise.resolve is good for wrapping synchronous code
	Promise.resolve().then(function () {
	if (somethingIsNotRight()) {
	throw new Error("I will be rejected asynchronously!");

	<?php

	/**
	* Send a Message to a Slack Channel.
	*
	* In order to get the API Token visit:
	*
	* 1.) Create an APP -> https://api.slack.com/apps/
	* 2.) See menu entry "Install App"
	* 3.) Use the "Bot User OAuth Token"

	db:
	image: oracle/database:11.2.0.2-xe
	ports:
	- 1521:1521
	- 8085:8080
	shm_size: 1g
	volumes:
	- ./data:/u01/app/oracle/oradata
	environment:
	- ORACLE_PWD=<password>