search

dart-atom / dart

A Dart plugin for Atom.
http://dart-atom.github.io/dart/
BSD 3-Clause "New" or "Revised" License
154 stars 44 forks source link

View management #1138

Closed cdavidjean closed 6 years ago

cdavidjean commented 6 years ago
cdavidjean commented 6 years ago

Conflicts remains ? :(

cdavidjean commented 6 years ago

I think I have it now, was missing git add and git commit for the merged files. I should've noticed... :)

devoncarew commented 6 years ago

Awesome! Looks like the PR is right with git; will review today.

cdavidjean commented 6 years ago

Thanks!