Files

Code review comment for lp:~jeremywootten/pantheon-files/fix-network-browsing

  1. fix-network-browsing
  2. Merge into trunk
Revision history for this message
Danielle Foré (danrabbit) wrote :

When attempting to merge trunk I get:
Text conflict in libcore/gof-directory-async.vala
Text conflict in libwidgets/LocationBar.vala
Text conflict in src/View/LocationBar.vala
3 conflicts encountered.

If we can get those conflicts solved, Cody and I would like to merge this within the next day or so

« Back to merge proposal