huobazi

We couldn’t find that file to show.

darcyparker

mattratleph

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

kana

--- src/main.c~ 2012-10-23 12:35:34.000000000 +0900
+++ src/main.c  2012-12-04 18:42:25.000000000 +0900
@@ -2315,6 +2315,7 @@
                        mch_errmsg("\"\n");
                        mch_exit(2);
                    }
+                   setvbuf(scriptout, NULL, _IONBF, 0);
                    break;

 #ifdef FEAT_GUI_W32

tyrasd

1. download the source data

    wget http://fred.dev.openstreetmap.org/density/tiles.13
    wget http://fred.dev.openstreetmap.org/density/tiles.16
   

2. convert to simple, gnuplot-readable text format

    sed 's/\([0-9]*\) z=\([0-9]*\) x=\([0-9]*\) y=\([0-9]*\)/\3 \4 \1/' < tiles.13 > tiles.13.txt
    sed 's/\([0-9]*\) z=\([0-9]*\) x=\([0-9]*\) y=\([0-9]*\)/\3 \4 \1/' < tiles.16 > tiles.16.txt
   

mathiasbynens

List of features that are supported by Opera 12 but not by Opera 15 due to the switch to Blink/Chromium:

• xhr.responseType = 'json' fixed as of August 19, 2013
• Link HTTP header
• Link HTTP header for stylesheets specifically
• Pressing Enter when an element with tabindex has focus should trigger a click
• Fragment identifiers in data: URIs should be handled correctly
• CSS gradients with transparency
• Accurate SVG rendering
• [`` where foo.svg is an SVG file that contains text looks terrible](https://code.google.com/p/chromium/issues/detail?id=33

absurd

# Copyright 2013AD Gallus Absurd


def unfalse_poem():
    None is not True or False
    for subject in [complex(True,False)]:
        subject is not object
        for certainty in [complex(False,True)]:
            certainty is not Exception
            certainty is not license

jacquesbh

Warning: array_key_exists() expects parameter 2 to be array, null given  in /var/www/magento/app/code/core/Mage/Captcha/Model/Observer.php on line 69

#0 [internal function]: mageCoreErrorHandler(2, 'array_key_exist...', '/var/www/magent...', 69, Array)
#1 /var/www/magento/app/code/core/Mage/Captcha/Model/Observer.php(69): array_key_exists('username', NULL)
#2 /var/www/magento/app/code/core/Mage/Core/Model/App.php(1338): Mage_Captcha_Model_Observer->checkUserLogin(Object(Varien_Event_Observer))
#3 /var/www/magento/app/code/core/Mage/Core/Model/App.php(1317): Mage_Core_Model_App->_callObserverMethod(Object(Mage_Captcha_Model_Observer), 'checkUserLogin', Object(Varien_Event_Observer))
#4 /var/www/magento/app/Mage.php(447): Mage_Core_Model_App->dispatchEvent('controller_acti...', Array)
#5 /var/www/magento/app/code/core/Mage/Core/Controller/Varien/Action.php(532): Mage::dispatchEvent('controller_acti...', Array)
#6 /var/www/magento/app/code/core/Mage/Core/Controller/Front/Action.php(64): Mage_Core_Controller_Var

eurica

require 'csv'

#Parse the CSV that Twilio provides https://www.twilio.com/resources/rates/international-rates.csv
numbers = []
CSV.foreach('international-rates.csv', :headers => true) do |row|
  starts = row[2].split(",")    
  starts.each do |p|
    numbers.push([p.strip, p.strip.length, row[1], row[0]])
  end
end

kyledrake

# The blog post that started it all: https://neocities.org/blog/the-fcc-is-now-rate-limited
#
# Current known FCC address ranges:
# https://news.ycombinator.com/item?id=7716915
#
# Confirm/locate FCC IP ranges with this: http://whois.arin.net/rest/net/NET-165-135-0-0-1/pft
#
# In your nginx.conf:

location / {