Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote-tracking branch 'acdha/master'

Conflicts:
	Snippets/block.tmSnippet
  • Loading branch information...
commit a5cf575f1326f8699568309b3c0368541c4b4dd8 2 parents 63ebcbc + 746be3a
Eduardo Felipe authored October 20, 2011
2  Snippets/block.tmSnippet
@@ -3,7 +3,7 @@
3 3
 <plist version="1.0">
4 4
 <dict>
5 5
 	<key>content</key>
6  
-	<string>{% block $1 %}$2{% endblock %}</string>
  6
+	<string>{% block $1 %}$2{% endblock $1 %}</string>
7 7
 	<key>name</key>
8 8
 	<string>block</string>
9 9
 	<key>scope</key>
16  Snippets/super.tmSnippet
... ...
@@ -0,0 +1,16 @@
  1
+<?xml version="1.0" encoding="UTF-8"?>
  2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  3
+<plist version="1.0">
  4
+<dict>
  5
+	<key>content</key>
  6
+	<string>{{ block.super }}</string>
  7
+	<key>name</key>
  8
+	<string>super</string>
  9
+	<key>scope</key>
  10
+	<string>text.html.django</string>
  11
+	<key>tabTrigger</key>
  12
+	<string>super</string>
  13
+	<key>uuid</key>
  14
+	<string>73B14781-84AF-4B1D-9C43-01C0B2DCE9F9</string>
  15
+</dict>
  16
+</plist>

0 notes on commit a5cf575

Please sign in to comment.
Something went wrong with that request. Please try again.