Skip to content

Commit 4a2f4e1

Browse files
committed
解决冲突
1 parent 05c00a0 commit 4a2f4e1

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

qq.md

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,9 @@
259259
- [css3 按钮动画](http://fian.my.id/Waves/)
260260
- [animate.css](http://daneden.github.io/animate.css/)
261261
- [全局CSS的终结(狗带) []](http://www.alloyteam.com/2015/10/8536/)
262-
<<<<<<< HEAD
263262
- [ANIMATION - 大漠](http://www.w3cplus.com/blog/tags/29.html)
264-
=======
265263
- [css选择器](http://www.haorooms.com/tools/css_selecter/)
266-
>>>>>>> 6c9b5c58c8c36c8741883ffb287815a206592ce5
264+
267265

268266
####7. Angularjs
269267

@@ -467,10 +465,8 @@
467465
- [小胡子哥 - 进阶正则表达式](http://div.io/topic/764?page=1)
468466
- [is.js](https://github.com/Cedriking/is.js/blob/master/is.js)
469467
- [正则在线测试](http://regexper.com/)
470-
<<<<<<< HEAD
471-
=======
472468
- [haorooms正则文章](http://www.haorooms.com/search?keyword=%E6%AD%A3%E5%88%99)
473-
>>>>>>> 6c9b5c58c8c36c8741883ffb287815a206592ce5
469+
474470

475471
####22. ionic
476472

@@ -683,14 +679,12 @@
683679
- [一个风格多样的日历](https://github.com/glad/glDatePicker)
684680
- [弹出层式的全日历](http://amsul.ca/pickadate.js/date/)
685681
- [jquery双日历](http://www.daterangepicker.com/)
686-
<<<<<<< HEAD
687682
- [bootstrap-datetimepicker/](http://www.bootcss.com/p/bootstrap-datetimepicker/)
688683
- [贤心-laydate](http://laydate.layui.com/)
689684
- [Pikaday-微型日历](http://dbushell.github.io/Pikaday/)
690685
- [AngularJS datepicker directives](https://github.com/g00fy-/angular-datepicker)
691-
=======
692686
- [周选择日历插件](https://github.com/confidence68/Kalendae)
693-
>>>>>>> 6c9b5c58c8c36c8741883ffb287815a206592ce5
687+
694688

695689
2. 移动
696690

@@ -819,10 +813,7 @@
819813
####16. 城市联动
820814

821815
- [jquery.cityselect.js基于jQuery+JSON的省市或自定义联动效果](http://www.ijquery.cn/?p=360)
822-
<<<<<<< HEAD
823-
=======
824816
- [移动端省市三级联动demo](http://resource.haorooms.com/softshow-33-127-1.html)
825-
>>>>>>> 6c9b5c58c8c36c8741883ffb287815a206592ce5
826817

827818
####17. 剪贴板
828819

@@ -948,10 +939,7 @@
948939
- [Why Website Speed is Important](http://sixrevisions.com/web-development/why-website-speed-is-important/)
949940
- [Need for Speed – How to Improve your Website Performance](http://www.devbridge.com/articles/need-for-speed-how-to-improve-your-website-performance/)
950941
- [阿里无线前端性能优化指南 (Pt.1 加载期优化) ](https://github.com/amfe/article/issues/1)
951-
<<<<<<< HEAD
952-
=======
953942
- [前端性能优化补充篇](http://www.haorooms.com/post/qianduan_xnyhbc)
954-
>>>>>>> 6c9b5c58c8c36c8741883ffb287815a206592ce5
955943

956944
2. 优化工具
957945

0 commit comments

Comments
 (0)