git merge --abort
reolve confilcts
git pull
git merge --abort
git pull -Xtheirs github master
git merge --abort
reolve confilcts
git pull
git merge --abort
git pull -Xtheirs github master
<head> | |
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.2.6/gridstack.min.css" /> | |
<link rel="stylesheet" href="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.css"/> | |
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"/> | |
<script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js'></script> | |
<script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.11.0/jquery-ui.js"></script> | |
<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/3.5.0/lodash.min.js"></script> | |
<script type="text/javascript" src='https://cdnjs.cloudflare.com/ajax/libs/gridstack.js/0.2.6/gridstack.min.js'></script> | |
<script src="//cdn.jsdelivr.net/chartist.js/latest/chartist.min.js"></script> | |
</head> |
package main | |
import ( | |
"encoding/json" | |
"fmt" | |
) | |
func main() { | |
s := `{"text":"I'm a text.","number":1234,"floats":[1.1,2.2,3.3],"innermap":{"foo":1,"bar":2}}` |
var a = [6, 5, 3, 1, 9, 7, 2, 4]; | |
var length = a.length ; | |
bubbleSort = function (){ | |
var swap = 0 ; | |
for (i = 0 ; i < length - i + 1 ; i++){ | |
for (var j = 1 ; j < length - i ; j++) { | |
if (a[j-1] > a[j] ){ | |
console.log ("moving " + a[j-1]) | |
swap = a[j] ; | |
a[j] = a[j-1] ; |
import paho.mqtt.client as mqtt | |
from os import path | |
import json | |
BASE_URL = "" ; | |
CHANNEL_ALL = 'common' | |
CHANNEL_REPLY = 'reply' | |
CLIENT = '/me-it' | |
class Client: | |
def __init__(self, name, suffix =""): |
#TODO |
from PIL import Image | |
from math import floor | |
from PIL import ImageFilter | |
def cin(): | |
pil_im = Image.open('test.png') | |
width = pil_im.width | |
height = pil_im.height |
<!DOCTYPE html> | |
<html> | |
<head> | |
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"> | |
</script> | |
<meta charset='utf-8' /> | |
<title> | |
infinite loop carousel(horizontal) | |
</title> |
When hosting our web applications, we often have one public IP
address (i.e., an IP address visible to the outside world)
using which we want to host multiple web apps. For example, one
may wants to host three different web apps respectively for
example1.com
, example2.com
, and example1.com/images
on
the same machine using a single IP address.
How can we do that? Well, the good news is Internet browsers
<!DOCTYPE html> | |
<html> | |
<head> | |
<title>Leaflet Custom Simple Map Example</title> | |
<meta charset="utf-8" /> | |
<meta name="viewport" content="width=device-width, initial-scale=1.0"> | |
<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-1.0.0-b1/leaflet.css" /> | |
<link rel="stylesheet" href="https://cdn.rawgit.com/ardhi/Leaflet.MousePosition/master/src/L.Control.MousePosition.css"> |