diff options
| author | Jon Reid | 2012-06-28 09:51:33 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-28 09:51:33 -0700 |
| commit | 8780f4be63bac964d23939127298f6334f482cdf (patch) | |
| tree | 197ffef1e31f60f3dc8ddb23a36f263f65c32a9f /node_modules/montage-google/youtube-channel.reel/youtube-channel.html | |
| parent | b50b720e7b34cea86e9aabfb27e843376508b00e (diff) | |
| parent | 7e098b5a710776439ca6ad00604e2f2011dbc4ed (diff) | |
| download | ninja-8780f4be63bac964d23939127298f6334f482cdf.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Used Theirs, doesn't matter, code block is in commented-out section.
Diffstat (limited to 'node_modules/montage-google/youtube-channel.reel/youtube-channel.html')
| -rw-r--r-- | node_modules/montage-google/youtube-channel.reel/youtube-channel.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html index 112fda72..01cc42f3 100644 --- a/node_modules/montage-google/youtube-channel.reel/youtube-channel.html +++ b/node_modules/montage-google/youtube-channel.reel/youtube-channel.html | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | }, | 41 | }, |
| 42 | 42 | ||
| 43 | "owner": { | 43 | "owner": { |
| 44 | "module": "youtube-channel.reel", | ||
| 45 | "name": "YoutubeChannel", | 44 | "name": "YoutubeChannel", |
| 46 | "properties": { | 45 | "properties": { |
| 47 | "element": {"#": "container"}, | 46 | "element": {"#": "container"}, |