Skip to content

Commit

Permalink
Fix merge conflict on ScriptRepositoryView.ui
Browse files Browse the repository at this point in the history
  • Loading branch information
gesnerpassos committed Jul 5, 2013
1 parent 28481be commit c2ac5af
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="MantidQt::API::RepoTreeView" name="repo_treeView"/>
Expand Down

0 comments on commit c2ac5af

Please sign in to comment.