You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: README.md
+11-17Lines changed: 11 additions & 17 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -119,7 +119,6 @@ This repository holds the Android App for performing experiments with [PSLab](ht
119
119
120
120
## How to set up the Android app in your development environment
121
121
122
-
123
122
### Application Flavors
124
123
125
124
There are 2 flavors (build variants) of PSLab Android application.
@@ -218,17 +217,9 @@ Despite any reason, follow the steps given below to squash all commits into one
218
217
### Branch Policy
219
218
220
219
We have the following branches
221
-
***development**
222
-
All development goes on in this branch. If you're making a contribution,
223
-
you are supposed to make a pull request to _development_.
224
-
Make sure it passes a build check on Travis.
225
-
226
-
***master**
227
-
This contains the stable code. After significant features/bugfixes are accumulated on development, we move it to master.
228
-
229
-
***apk**
230
-
This branch contains automatically generated apk file for testing.
231
-
220
+
***development** All development goes on in this branch. If you're making a contribution, you are supposed to make a pull request to _development_. Make sure it passes a build check on Travis.
221
+
***master** This contains the stable code. After significant features/bugfixes are accumulated on development, we move it to master.
222
+
***apk** This branch contains automatically generated apk file for testing.
232
223
233
224
### Code style
234
225
@@ -239,19 +230,18 @@ Please try to follow the mentioned guidelines while writing and submitting your
239
230
* The activity/fragment file name corresponding to the layout files should be named as (activity/fragment name)(activity/fragment).java like ```ChannelsParameterFragment.java``` corresponding to the layout file ```fragment_channels_parameter.xml``` .
240
231
* The corresponding widgets for buttons, textboxes, checkboxes etc. in activity files should be named as (viewtype/widget)(fragment/activity name)(no. in the file) like ```spinnerChannelSelect1``` corresponding to ```spinner_channel_select1``` .
241
232
242
-
## License
243
-
244
-
This project is currently licensed under the Apache License 2.0. A copy of [LICENSE](LICENSE) is to be present along with the source code. To obtain the software under a different license, please contact FOSSASIA.
This project is currently licensed under the Apache License 2.0. A copy of [LICENSE](LICENSE) is to be present along with the source code. To obtain the software under a different license, please contact FOSSASIA.
0 commit comments