浏览代码

Merge branch 'master' of https://git.keller.io/KELLER/Nuke_Workgroup_12.2 into master

 Conflicts:
	gitattributes
父节点
当前提交
8afcae3cd1
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1
    1
      README.md
  2. 1
    1
      gitattributes

+ 1
- 1
README.md 查看文件

@@ -25,7 +25,7 @@
25 25
 
26 26
 - sceneControl
27 27
 
28
-![screenshot](./doc/sceneControl.jpg)
28
+![image](./doc/sceneControl.jpg)
29 29
 ![screenshot](./doc/sceneControl_m0.jpg)
30 30
 ![screenshot](./doc/sceneControl_m1.jpg)
31 31
 ![screenshot](./doc/sceneControl_m2.jpg)

.gitattributes → gitattributes 查看文件

@@ -18,4 +18,4 @@
18 18
 *.pdf filter=lfs diff=lfs merge=lfs -text
19 19
 *.nfp filter=lfs diff=lfs merge=lfs -text
20 20
 
21
-doc/** !filter
21
+doc/*.* -filter=lfs -diff=lfs -merge=lfs -text

正在加载...
取消
保存