Skip to content

Commit

Permalink
Merge branch 'drnic/master'
Browse files Browse the repository at this point in the history 
Conflicts:
	info.plist
  • Loading branch information
@carlosbrando
carlosbrando committed Sep 7, 2010
2 parents 37cff3f + ebfd96d commit d2a1c18
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Snippets/Create sweeper class.tmSnippet
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>content</key> <key>content</key>
<string>class ${1:Model}Sweeper < ActionController::Caching::Sweeper <string>class ${1:Model}Sweeper &lt; ActionController::Caching::Sweeper
observe ${1:Model} observe ${1:Model}
def after_save(${1/./\l$0/}) def after_save(${1/./\l$0/})
Expand Down
11 changes: 4 additions & 7 deletions info.plist
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -227,8 +227,6 @@
<array> <array>
<string>1970AE74-3949-40B3-B263-727AA3FF167A</string> <string>1970AE74-3949-40B3-B263-727AA3FF167A</string>
<string>------------------------------------</string> <string>------------------------------------</string>
<string>5694BA8B-64EC-4B1B-A00D-6366D28500C5</string>
<string>------------------------------------</string>
<string>CD88AD5A-7F20-4D4C-882A-31E1CDFDFD16</string> <string>CD88AD5A-7F20-4D4C-882A-31E1CDFDFD16</string>
<string>B89CD2E9-4271-41BB-8AF6-A747553D99EB</string> <string>B89CD2E9-4271-41BB-8AF6-A747553D99EB</string>
<string>3DF64504-EE4E-4EA2-BE81-80D8DE446656</string> <string>3DF64504-EE4E-4EA2-BE81-80D8DE446656</string>
Expand Down Expand Up @@ -469,6 +467,7 @@
<string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string> <string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string>
<string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string> <string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string>
<string>8B515110-41D3-11DD-AE16-0800200C9A66</string> <string>8B515110-41D3-11DD-AE16-0800200C9A66</string>
<string>B105C480-FB21-4511-9AD0-D5B4FED3BA21</string>
<string>B660FC85-F69A-43BC-A72A-748CBEA0AA9A</string> <string>B660FC85-F69A-43BC-A72A-748CBEA0AA9A</string>
<string>------------------------------------</string> <string>------------------------------------</string>
<string>7CC002AE-83BA-4294-B87D-DE9790839D97</string> <string>7CC002AE-83BA-4294-B87D-DE9790839D97</string>
Expand Down Expand Up @@ -663,7 +662,6 @@
<string>------------------------------------</string> <string>------------------------------------</string>
<string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string> <string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string>
<string>D0E29200-E910-11DC-A399-00112475D960</string> <string>D0E29200-E910-11DC-A399-00112475D960</string>
<string>4EA6FBD1-CDEA-4DF6-9F70-A1EDA35AC3D7</string>
<string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string> <string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string>
<string>245AD020-669A-46E1-8123-4B9CFDF8075A</string> <string>245AD020-669A-46E1-8123-4B9CFDF8075A</string>
<string>1ED49D4D-D4A0-4CF0-8ED2-DCE70854B839</string> <string>1ED49D4D-D4A0-4CF0-8ED2-DCE70854B839</string>
Expand Down Expand Up @@ -792,7 +790,6 @@
<string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string> <string>F0F6DACA-6A0B-11D9-BDC2-000D932CD5BA</string>
<string>D0E29200-E910-11DC-A399-00112475D960</string> <string>D0E29200-E910-11DC-A399-00112475D960</string>
<string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string> <string>9FB9848E-EA5A-11DC-9DE5-00112475D960</string>
<string>4EA6FBD1-CDEA-4DF6-9F70-A1EDA35AC3D7</string>
<string>326B57A7-B4A9-447B-A3D2-0EA74158E1E1</string> <string>326B57A7-B4A9-447B-A3D2-0EA74158E1E1</string>
<string>6BA737F0-63D1-4D82-9381-4331E18B12C5</string> <string>6BA737F0-63D1-4D82-9381-4331E18B12C5</string>
<string>750DEEF9-18A0-40FC-8E54-574CE5EE5565</string> <string>750DEEF9-18A0-40FC-8E54-574CE5EE5565</string>
Expand Down Expand Up @@ -932,7 +929,6 @@
<string>EC511A43-D3B7-11DC-BA49-00112475D960</string> <string>EC511A43-D3B7-11DC-BA49-00112475D960</string>
<string>F8316545-9AE4-4C7F-87ED-A2C00E6637FA</string> <string>F8316545-9AE4-4C7F-87ED-A2C00E6637FA</string>
<string>43680344-0818-42BF-95B4-58CD2D76545B</string> <string>43680344-0818-42BF-95B4-58CD2D76545B</string>
<string>5694BA8B-64EC-4B1B-A00D-6366D28500C5</string>
<string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string> <string>A017AB39-A875-40DC-8ACF-7E3551057CA0</string>
<string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string> <string>FE430ECD-5D40-4D95-A73B-F064C73992DE</string>
<string>59CD3A41-8164-4FB4-B462-D7ACE86BCDBF</string> <string>59CD3A41-8164-4FB4-B462-D7ACE86BCDBF</string>
Expand All @@ -943,12 +939,13 @@
<string>5D01527E-48FA-4A3D-A10B-A383C8AE3942</string> <string>5D01527E-48FA-4A3D-A10B-A383C8AE3942</string>
<string>CEA1D76C-DEB0-4ADB-840D-220E569D5B8F</string> <string>CEA1D76C-DEB0-4ADB-840D-220E569D5B8F</string>
<string>83B80B60-6143-4465-B064-0DA25DDDCAA7</string> <string>83B80B60-6143-4465-B064-0DA25DDDCAA7</string>
<string>7B15B396-1F41-4529-9253-32761E94448C</string>
<string>D975E5C1-42C2-40F1-8960-0DA533B18113</string> <string>D975E5C1-42C2-40F1-8960-0DA533B18113</string>
<string>36E2A3EE-E9CC-4B7F-A4CF-AFAF970B8699</string> <string>36E2A3EE-E9CC-4B7F-A4CF-AFAF970B8699</string>
<string>38D5CA05-E219-4399-A244-609AF40B1D0B</string> <string>38D5CA05-E219-4399-A244-609AF40B1D0B</string>
<string>7053B86A-9B81-4154-AB3C-61B8035C5D33</string> <string>7053B86A-9B81-4154-AB3C-61B8035C5D33</string>
<string>35E95C81-22F7-4C40-8297-ED21086DDA81</string> <string>35E95C81-22F7-4C40-8297-ED21086DDA81</string>
<string>7B15B396-1F41-4529-9253-32761E94448C</string>
<string>786980D8-FA69-4542-85A3-5E48CFAA6814</string>
<string>9671EB7A-89D6-4C23-914F-88CBEE0D177A</string> <string>9671EB7A-89D6-4C23-914F-88CBEE0D177A</string>
<string>E0F281EC-5311-41F8-ADD9-2E2D059DA651</string> <string>E0F281EC-5311-41F8-ADD9-2E2D059DA651</string>
<string>F57522B2-9F5F-4DF9-AE46-9478AF019C63</string> <string>F57522B2-9F5F-4DF9-AE46-9478AF019C63</string>
Expand Down Expand Up @@ -979,7 +976,7 @@
<string>8B515110-41D3-11DD-AE16-0800200C9A66</string> <string>8B515110-41D3-11DD-AE16-0800200C9A66</string>
<string>5C773E3D-436E-4A28-8399-859CE41E504F</string> <string>5C773E3D-436E-4A28-8399-859CE41E504F</string>
<string>32F30207-D827-46D9-889A-451C35269D52</string> <string>32F30207-D827-46D9-889A-451C35269D52</string>
<string>AECD46CF-9031-4059-B386-262DBABD97B1</string> <string>FF022038-CA5D-4045-909E-BF509343A5C7</string>
<string>675DD92F-42F1-4B55-B56A-5D4ABC1375C4</string> <string>675DD92F-42F1-4B55-B56A-5D4ABC1375C4</string>
<string>CF489B31-5DD2-4B83-B503-AD3ECF7BDEB7</string> <string>CF489B31-5DD2-4B83-B503-AD3ECF7BDEB7</string>
<string>0742F232-38ED-4C52-AD68-1858F0F2C601</string> <string>0742F232-38ED-4C52-AD68-1858F0F2C601</string>
Expand Down

0 comments on commit d2a1c18

Please sign in to comment.