Skip to content

Commit

Permalink
Merge branch 'fix_filter_box_display' of https://github.com/marc-outi…
Browse files Browse the repository at this point in the history
…ns/WhiteRabbit into fix_filter_box_display

Conflicts:
	src/org/ohdsi/rabbitInAHat/FilterDialog.java
  • Loading branch information
Marc Halperin committed Jun 17, 2015
2 parents 39abeb2 + 43bf7b0 commit 7a8ca2a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/org/ohdsi/rabbitInAHat/FilterDialog.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public FilterDialog(Window parentWindow){

layout.putConstraint(SpringLayout.WEST, targetLabel, 5, SpringLayout.WEST, contentPane);
layout.putConstraint(SpringLayout.NORTH, targetLabel, 10, SpringLayout.SOUTH, sourceLabel);

layout.putConstraint(SpringLayout.WEST, targetSearchField, 0, SpringLayout.WEST, sourceSearchField);
layout.putConstraint(SpringLayout.NORTH, targetSearchField, 0, SpringLayout.NORTH, targetLabel);

Expand Down

0 comments on commit 7a8ca2a

Please sign in to comment.