forked from translation-gang/ru.vuejs.org
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathMERGELOG
56 lines (54 loc) · 3.42 KB
/
MERGELOG
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
2016.11.09 Merging 7cd45cf..97d7814
==========================================================================================================
Auto-merging src/v2/guide/comparison.md
MANUALLY fixed conflict (updated content): Merge conflict in src/v2/guide/comparison.md
Auto-merging src/v2/guide/class-and-style.md
2016.11.07 Merging with https://github.com/vuejs/vuejs.org/commit/7cd45cf91aac22d94487368d093cead254048c06
==========================================================================================================
Removing themes/vue/layout/partials/ga.ejs
Auto-merging src/v2/guide/unit-testing.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/unit-testing.md
Auto-merging src/v2/guide/transitions.md
Auto-merging src/v2/guide/transitioning-state.md
Auto-merging src/v2/guide/syntax.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/syntax.md
Auto-merging src/v2/guide/single-file-components.md
MANUALLY fixed conflict (?) (content): Merge conflict in src/v2/guide/single-file-components.md
Auto-merging src/v2/guide/render-function.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/render-function.md
Auto-merging src/v2/guide/reactivity.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/reactivity.md
Auto-merging src/v2/guide/mixins.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/mixins.md
Auto-merging src/v2/guide/migration.md
MANUALLY fixed conflict (content): Merge conflict in src/v2/guide/migration.md
Auto-merging src/v2/guide/migration-vuex.md
Auto-merging src/v2/guide/migration-vue-router.md
Auto-merging src/v2/guide/list.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/list.md
Auto-merging src/v2/guide/instance.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/instance.md
Auto-merging src/v2/guide/installation.md
MANUALLY fixed conflict (local links, new paragraph) (content): Merge conflict in src/v2/guide/installation.md
Auto-merging src/v2/guide/index.md
MANUALLY fixed conflict (new conent, local links) (content): Merge conflict in src/v2/guide/index.md
Auto-merging src/v2/guide/forms.md
MANUALLY fixed conflict (new conent, local links) (content): Merge conflict in src/v2/guide/forms.md
Auto-merging src/v2/guide/events.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/events.md
Auto-merging src/v2/guide/custom-directive.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/custom-directive.md
Auto-merging src/v2/guide/computed.md
MANUALLY fixed conflict (local links) (content): Merge conflict in src/v2/guide/computed.md
Auto-merging src/v2/guide/components.md
MANUALLY fixed conflict (new conent, local links) (content): Merge conflict in src/v2/guide/components.md
Auto-merging src/v2/guide/comparison.md
MANUALLY fixed conflict (new conent, local links, translation typos) (content): Merge conflict in src/v2/guide/comparison.md
Auto-merging src/v2/guide/class-and-style.md
MANUALLY fixed conflict (new conent) (content): Merge conflict in src/v2/guide/class-and-style.md
Auto-merging src/v2/examples/todomvc.md
Auto-merging src/v2/api/index.md
MANUALLY fixed conflict (new conent, local links) (content): Merge conflict in src/v2/api/index.md
Auto-merging src/support-vuejs/index.md
Removing src/guide/.npmignore
Removing src/examples/index.md